From 9447dcd6a625a98babb4f5316df81110d7a6eb4c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 27 Apr 2013 22:19:17 +0000 Subject: luaotfload (27apr13) git-svn-id: svn://tug.org/texlive/trunk@30137 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luaotfload/NEWS | 7 ++++ .../doc/luatex/luaotfload/luaotfload.pdf | Bin 114275 -> 98233 bytes .../source/luatex/luaotfload/luaotfload.dtx | 17 ++++---- .../tex/luatex/luaotfload/luaotfload.lua | 6 +-- .../tex/luatex/luaotfload/otfl-font-com.lua | 16 -------- .../tex/luatex/luaotfload/otfl-font-nms.lua | 45 +++++++++------------ 6 files changed, 39 insertions(+), 52 deletions(-) delete mode 100644 Master/texmf-dist/tex/luatex/luaotfload/otfl-font-com.lua (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/luatex/luaotfload/NEWS b/Master/texmf-dist/doc/luatex/luaotfload/NEWS index 0f7184abe95..5137c2c60ec 100644 --- a/Master/texmf-dist/doc/luatex/luaotfload/NEWS +++ b/Master/texmf-dist/doc/luatex/luaotfload/NEWS @@ -1,6 +1,13 @@ Change History -------------- +2013/04/25, 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/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf index fd97e4b0ea6..cf05f026a14 100644 Binary files a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf and b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf differ diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx index fa6d709f207..3f312802ad4 100644 --- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx +++ b/Master/texmf-dist/source/luatex/luaotfload/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/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua index ab837536af3..7365581a64f 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua @@ -21,8 +21,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", @@ -107,7 +107,7 @@ local function def_font(...) end return fontdata end -fonts.define.resolvers.file = fonts.define.resolvers.name +--fonts.define.resolvers.file = fonts.define.resolvers.name fonts.mode = "node" local register_base_sub = fonts.otf.features.register_base_substitution local gsubs = { diff --git a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-com.lua b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-com.lua deleted file mode 100644 index 4b6d8162f56..00000000000 --- a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-com.lua +++ /dev/null @@ -1,16 +0,0 @@ -if not modules then modules = { } end modules ['font-com'] = { - version = 1.002, - comment = "Luaotfload backward compatibility module", - author = "Elie Roux", - copyright = "Luaotfload Development Team", - license = "GNU GPL v2" -} - -fonts = fonts or { } -local fonts = fonts - --- In new ConTeXt versions, fonts.identifiers is renamed in --- fonts.hashes.identifiers, this break fontspec from TeXLive 2012 -if not fonts.identifiers then - fonts.identifiers = fonts.hashes.identifiers -end 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 50febabc219..fa9edcaef66 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua @@ -155,23 +155,22 @@ function names.resolve(specification) table.contains(synonyms.regular, subfamily) then found.fallback = face end - else - if name == fullname - or name == pfullname - or name == fontname - or name == psname then - if optsize then - if dsnsize == size - or (size > minsize and size <= maxsize) then - found[1] = face - break - else - found[#found+1] = face - end - else + end + if name == fullname + or name == pfullname + or name == fontname + or name == psname then + if optsize then + if dsnsize == size + or (size > minsize and size <= maxsize) then found[1] = face break + else + found[#found+1] = face end + else + found[1] = face + break end end end @@ -357,9 +356,7 @@ local function load_font(filename, fontnames, newfontnames, texmf) return end local index = newstatus[basefile].index[i] - if newstatus[basefile].index[i] then - index = newstatus[basefile].index[i] - else + if not index then index = #newmappings+1 end newmappings[index] = fullinfo @@ -370,10 +367,8 @@ local function load_font(filename, fontnames, newfontnames, texmf) if not fullinfo then return end - local index - if newstatus[basefile].index[1] then - index = newstatus[basefile].index[1] - else + local index = newstatus[basefile].index[1] + if not index then index = #newmappings+1 end newmappings[index] = fullinfo @@ -510,12 +505,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) @@ -654,9 +649,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