summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/luatex/luaotfload/NEWS8
-rw-r--r--Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdfbin103428 -> 114275 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua4
-rw-r--r--Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx22
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua7
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/otfl-font-com.lua16
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua28
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/otfl-font-otf.lua2
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/otfl-luat-dum.lua2
10 files changed, 64 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/NEWS b/Master/texmf-dist/doc/luatex/luaotfload/NEWS
index ceff36ab60f..0f7184abe95 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/NEWS
+++ b/Master/texmf-dist/doc/luatex/luaotfload/NEWS
@@ -1,6 +1,14 @@
Change History
--------------
+2013/04/11, luaotfload v1.28:
+ * Adapting to LuaTeX 0.75
+ * Fix small documentation issues in mkluatexfontdb
+ * Fix possibility of infite loop fontconfig config files references
+ * Adding semibold synonym for bold
+ * file:xxx syntax now uses the same search function as name: which
+ make more fonts recognized
+
2012/05/28, luaotfload v1.27:
* Fix "endless loop in charlist" with some OpenType math fonts
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf
index 0c83b375540..fd97e4b0ea6 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf
+++ b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua b/Master/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua
index 553332d4c7a..62e15f33bad 100755
--- a/Master/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua
+++ b/Master/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua
@@ -33,9 +33,9 @@ Valid options:
-V --version print version and exit
-h --help print this message
-The output database file is named otfl-fonts.lua and is placed under:
+The output database file is named otfl-names.lua and is placed under:
- %s"
+ %s
]], name, names.path.localdir))
end
diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
index 452159075bd..fa6d709f207 100644
--- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
+++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2009-2010 by Elie Roux <elie.roux@telecom-bretagne.eu>
+% Copyright (C) 2009-2013 by Elie Roux <elie.roux@telecom-bretagne.eu>
% and Khaled Hosny <khaledhosny@eglug.org>
% (Support: <lualatex-dev@tug.org>.)
%
@@ -36,7 +36,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: luaotfload v1.27 OpenType layout system}
+\Msg{* Package: luaotfload v1.28 OpenType layout system}
\Msg{************************************************************************}
\keepsilent
@@ -47,7 +47,7 @@
\preamble
This is a generated file.
-Copyright (C) 2009-2010 by by Elie Roux <elie.roux@telecom-bretagne.eu>
+Copyright (C) 2009-2013 by by Elie Roux <elie.roux@telecom-bretagne.eu>
and Khaled Hosny <khaledhosny@eglug.org>
(Support: <lualatex-dev@tug.org>.)
@@ -104,7 +104,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{luaotfload.drv}%
- [2012/05/28 v1.27 OpenType layout system]%
+ [2013/04/11 v1.28 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{2012/05/28 v1.27}
+% \date{2013/04/11 v1.28}
% \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.27,
- date = "2012/05/28",
+ version = 1.28,
+ date = "2013/04/11",
description = "OpenType layout system.",
author = "Elie Roux & Hans Hagen",
copyright = "Elie Roux",
@@ -636,7 +636,13 @@ end
%
% \subsection{\context override}
%
-% Here we override some defaults set in \context code.
+% We have a unified function for both file and name resolver.
+%
+% \begin{macrocode}
+fonts.define.resolvers.file = fonts.define.resolvers.name
+% \end{macrocode}
+%
+% Overriding some defaults set in \context code.
%
% \begin{macrocode}
fonts.mode = "node"
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua
index f66221fa93a..ab837536af3 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua
@@ -7,7 +7,7 @@
-- luaotfload.dtx (with options: `lua')
-- This is a generated file.
--
--- Copyright (C) 2009-2010 by by Elie Roux <elie.roux@telecom-bretagne.eu>
+-- Copyright (C) 2009-2013 by by Elie Roux <elie.roux@telecom-bretagne.eu>
-- and Khaled Hosny <khaledhosny@eglug.org>
-- (Support: <lualatex-dev@tug.org>.)
--
@@ -21,8 +21,8 @@ module("luaotfload", package.seeall)
luaotfload.module = {
name = "luaotfload",
- version = 1.27,
- date = "2012/05/28",
+ version = 1.28,
+ date = "2013/04/11",
description = "OpenType layout system.",
author = "Elie Roux & Hans Hagen",
copyright = "Elie Roux",
@@ -107,6 +107,7 @@ local function def_font(...)
end
return fontdata
end
+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/luaotfload.sty b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty
index e865ed13f3f..02c913e76ae 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty
@@ -7,7 +7,7 @@
%% luaotfload.dtx (with options: `package')
%% This is a generated file.
%%
-%% Copyright (C) 2009-2010 by by Elie Roux <elie.roux@telecom-bretagne.eu>
+%% Copyright (C) 2009-2013 by by Elie Roux <elie.roux@telecom-bretagne.eu>
%% and Khaled Hosny <khaledhosny@eglug.org>
%% (Support: <lualatex-dev@tug.org>.)
%%
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-com.lua b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-com.lua
new file mode 100644
index 00000000000..4b6d8162f56
--- /dev/null
+++ b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-com.lua
@@ -0,0 +1,16 @@
+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 a8b3100937a..50febabc219 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua
@@ -76,9 +76,12 @@ end
local synonyms = {
regular = { "normal", "roman", "plain", "book", "medium" },
- bold = { "boldregular", "demi", "demibold" },
+ -- boldregular was for old versions of Linux Libertine, is it still useful?
+ -- semibold is in new versions of Linux Libertine, but there is also a bold,
+ -- not sure it's useful here...
+ bold = { "demi", "demibold", "semibold", "boldregular" },
italic = { "regularitalic", "normalitalic", "oblique", "slanted" },
- bolditalic = { "boldoblique", "boldslanted", "demiitalic", "demioblique", "demislanted", "demibolditalic" },
+ bolditalic = { "boldoblique", "boldslanted", "demiitalic", "demioblique", "demislanted", "demibolditalic", "semibolditalic" },
}
local loaded = false
@@ -493,8 +496,8 @@ local function scan_texmf_fonts(fontnames, newfontnames)
else
logs.info("Scanning TEXMF and OS fonts...")
end
- local fontdirs = expandpath("$OPENTYPEFONTS"):gsub("^\.", "")
- fontdirs = fontdirs .. expandpath("$TTFONTS"):gsub("^\.", "")
+ local fontdirs = expandpath("$OPENTYPEFONTS"):gsub("^%.", "")
+ fontdirs = fontdirs .. expandpath("$TTFONTS"):gsub("^%.", "")
if not fontdirs:is_empty() then
for _,d in next, splitpath(fontdirs) do
scan_dir(d, fontnames, newfontnames, true)
@@ -515,14 +518,16 @@ end
in OSFONTDIR.
]]
-local function read_fonts_conf(path, results)
+local function read_fonts_conf(path, results, passed_paths)
--[[
This function parses /etc/fonts/fonts.conf and returns all the dir it finds.
The code is minimal, please report any error it may generate.
]]
local f = io.open(path)
+ table.insert(passed_paths, path)
if not f then
- error("Cannot open the file "..path)
+ logs.info("Warning: unable to read "..path.. ", skipping...")
+ return results
end
local incomments = false
for line in f:lines() do
@@ -571,14 +576,15 @@ local function read_fonts_conf(path, results)
elseif not lfs.isfile(include) and not lfs.isdir(include) then
include = file.join(file.dirname(path), include)
end
- if lfs.isfile(include) then
- -- maybe we should prevent loops here?
+ if lfs.isfile(include) and kpse.readable_file(include) and not table.contains(passed_paths, include) then
-- we exclude path with texmf in them, as they should
-- be found otherwise
- read_fonts_conf(include, results)
+ read_fonts_conf(include, results, passed_paths)
elseif lfs.isdir(include) then
for _,f in next, glob(file.join(include, "*.conf")) do
- read_fonts_conf(f, results)
+ if not table.contains(passed_paths, f) then
+ read_fonts_conf(f, results, passed_paths)
+ end
end
end
end
@@ -604,7 +610,7 @@ local function get_os_dirs()
local windir = os.getenv("WINDIR")
return { file.join(windir, 'Fonts') }
else
- return read_fonts_conf("/etc/fonts/fonts.conf", {})
+ return read_fonts_conf("/etc/fonts/fonts.conf", {}, {})
end
end
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-otf.lua b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-otf.lua
index b46bc91915f..ce540865574 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-otf.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-otf.lua
@@ -1100,7 +1100,7 @@ otf.enhancers["reorganize kerns"] = function(data,filename)
if type(lookups) ~= "table" then
lookups = { lookups }
end
- local maxfirsts, maxseconds = getn(firsts), getn(seconds)
+ local maxfirsts, maxseconds = #firsts, #seconds
-- here we could convert split into a list of unicodes which is a bit
-- faster but as this is only done when caching it does not save us much
for _, s in next, firsts do
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/otfl-luat-dum.lua b/Master/texmf-dist/tex/luatex/luaotfload/otfl-luat-dum.lua
index 2f6627ff798..13b73b17fff 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/otfl-luat-dum.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/otfl-luat-dum.lua
@@ -62,7 +62,7 @@ local remapper = {
}
function resolvers.find_file(name,kind)
- name = string.gsub(name,"\\","\/")
+ name = string.gsub(name,"\\","/")
kind = string.lower(kind)
return kpse.find_file(name,(kind and kind ~= "" and (remapper[kind] or kind)) or file.extname(name,"tex"))
end
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 05:45:30 +0000