From 085d2102c19ddd99f5c4d3dca9be77d265ec2d0b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 19 May 2014 22:17:16 +0000 Subject: luaotfload (19may14) git-svn-id: svn://tug.org/texlive/trunk@34131 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luaotfload/NEWS | 4 ++++ .../texmf-dist/doc/luatex/luaotfload/filegraph.pdf | Bin 45558 -> 45545 bytes .../doc/luatex/luaotfload/luaotfload.pdf | Bin 222173 -> 222144 bytes Master/texmf-dist/doc/man/man1/luaotfload-tool.1 | 2 +- .../doc/man/man1/luaotfload-tool.man1.pdf | Bin 15440 -> 15440 bytes .../scripts/luaotfload/luaotfload-tool.lua | 4 ++-- .../source/luatex/luaotfload/luaotfload.dtx | 20 ++++++++++---------- .../tex/luatex/luaotfload/luaotfload-status.lua | 6 +++--- .../tex/luatex/luaotfload/luaotfload.lua | 12 ++++++------ .../tex/luatex/luaotfload/luaotfload.sty | 2 +- 10 files changed, 27 insertions(+), 23 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/luatex/luaotfload/NEWS b/Master/texmf-dist/doc/luatex/luaotfload/NEWS index 01958358023..a87417fa268 100644 --- a/Master/texmf-dist/doc/luatex/luaotfload/NEWS +++ b/Master/texmf-dist/doc/luatex/luaotfload/NEWS @@ -1,6 +1,10 @@ Change History -------------- +2014/05/18, luaotfload v2.4-4 + * Fix incorrect handling of font file formats (backport of commit + 828a69ef... to the 2.5 branch). + 2014/02/05, luaotfload v2.4-3 * Add contact info to --version output of luaotfload-tool (backport from 2.5). diff --git a/Master/texmf-dist/doc/luatex/luaotfload/filegraph.pdf b/Master/texmf-dist/doc/luatex/luaotfload/filegraph.pdf index d363630aeb8..bd2d0a6039b 100644 Binary files a/Master/texmf-dist/doc/luatex/luaotfload/filegraph.pdf and b/Master/texmf-dist/doc/luatex/luaotfload/filegraph.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf index d048643e15b..4e5f71ebe60 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/doc/man/man1/luaotfload-tool.1 b/Master/texmf-dist/doc/man/man1/luaotfload-tool.1 index 40ad91ad78a..d368e35f84a 100644 --- a/Master/texmf-dist/doc/man/man1/luaotfload-tool.1 +++ b/Master/texmf-dist/doc/man/man1/luaotfload-tool.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH LUAOTFLOAD-TOOL 1 "2014-02-05" "2.4-3" "text processing" +.TH LUAOTFLOAD-TOOL 1 "2014-05-18" "2.4-4" "text processing" .SH NAME luaotfload-tool \- generate and query the Luaotfload font names database . diff --git a/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf b/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf index 07ad2ffb9be..ee830d8378d 100644 Binary files a/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf and b/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf differ diff --git a/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua b/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua index 67ab2e7f1b6..5607c045039 100755 --- a/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua +++ b/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua @@ -4,12 +4,12 @@ -- DESCRIPTION: database functionality -- REQUIREMENTS: luaotfload 2.4 -- AUTHOR: Khaled Hosny, Élie Roux, Philipp Gesang --- VERSION: 2.4-3 +-- VERSION: 2.4-4 -- LICENSE: GPL v2 -- MODIFIED: 2013-07-28 13:12:04+0200 ----------------------------------------------------------------------- -local version = "2.4-3" --- . +local version = "2.4-4" --- . --[[doc-- diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx index 40b5df93400..3615fa8328b 100644 --- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx +++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx @@ -40,7 +40,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: luaotfload v2.4-3 OpenType layout system} +\Msg{* Package: luaotfload v2.4-4 OpenType layout system} \Msg{************************************************************************} \keepsilent @@ -111,7 +111,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{luaotfload.drv}% - [2014/02/05 v2.4-3 OpenType layout system]% + [2014/05/18 v2.4-4 OpenType layout system]% \documentclass{ltxdoc} \usepackage{metalogo,multicol,mdwlist,fancyvrb,xspace} \usepackage[x11names]{xcolor} @@ -231,7 +231,7 @@ and the derived files % \GetFileInfo{luaotfload.drv} % % \title{The \identifier{luaotfload} package} -% \date{2014/02/05 v2.4-3} +% \date{2014/05/18 v2.4-4} % \author{Elie Roux · Khaled Hosny · Philipp Gesang\\ % Home: \url{https://github.com/lualatex/luaotfload}\\ % Support: \email{lualatex-dev@tug.org}} @@ -1608,8 +1608,8 @@ end luaotfload.module = { name = "luaotfload", - version = 2.40004, --- 2.4-3 - date = "2014/02/05", + version = 2.40005, --- 2.4-4 + date = "2014/05/18", description = "OpenType layout system.", author = "Elie Roux & Hans Hagen", copyright = "Elie Roux", @@ -1995,7 +1995,7 @@ local file_resolver = function (specification) local name = resolve_file (specification.name) local suffix = filesuffix(name) if formats[suffix] then - specification.forced = suffix + specification.forced = string.lower (suffix) specification.forcedname = file.removesuffix(name) else specification.name = name @@ -2080,7 +2080,7 @@ request_resolvers.path = function (specification) else local suffix = filesuffix (name) if formats[suffix] then - specification.forced = suffix + specification.forced = string.lower (suffix) specification.name = file.removesuffix(name) specification.forcedname = name else @@ -2102,7 +2102,7 @@ request_resolvers.kpse = function (specification) if suffix and formats[suffix] then name = file.removesuffix(name) if resolvers.findfile(name, suffix) then - specification.forced = suffix + specification.forced = string.lower (suffix) specification.forcedname = name return end @@ -2130,7 +2130,7 @@ request_resolvers.name = function (specification) if resolved then specification.resolved = resolved specification.sub = subfont - specification.forced = filesuffix (resolved) + specification.forced = string.lower (filesuffix (resolved) or "") specification.forcedname = resolved specification.name = fileremovesuffix (resolved) else @@ -2233,7 +2233,7 @@ luaotfload.aux.start_rewrite_fontname () --- to be migrated to fontspec \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luaotfload}% - [2014/02/05 v2.4-3 OpenType layout system] + [2014/05/18 v2.4-4 OpenType layout system] \RequirePackage{luatexbase} \fi \ifnum\luatexversion<76 diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua index 4d63544b6e1..c04f048d048 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua @@ -6,7 +6,7 @@ return { { "luaotfload-tool.lua", "978fc97d7f3e60cc36a56e4375aabebb" }, { "luaotfload-override.lua", "d0e40ea83d625813aa0fe2f9e76d8ef5" }, { "luaotfload-fontloader.lua", "21b625efe6630b76250e18f7d2832cff" }, - { "luaotfload.lua", "fe691a3a26e3d2dc8d9a04df63e8fe68" }, + { "luaotfload.lua", "408064879902b664459e931e6abb75f3" }, { "luaotfload-loaders.lua", "b04c6d9aa2974d56895fe3dff3fea90d" }, { "luaotfload-letterspace.lua", "19e6181076dda7c8c34e7096cee1f873" }, { "luaotfload-glyphlist.lua", "ff440162d1b8a78a586375ee65630c21" }, @@ -27,7 +27,7 @@ return { }, ["notes"]={ ["committer"]="Philipp Gesang ", - ["revision"]="bd307a8fe8047d322317037c1a832720c236fb48", - ["timestamp"]="2014-02-05 21:06:28 +0100", + ["revision"]="828a69efb1f899f8707270f4515db20d485ccc34", + ["timestamp"]="2014-05-18 21:35:56 +0200", }, } \ No newline at end of file diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua index bbfe444eb9f..014249efd78 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua @@ -43,8 +43,8 @@ end luaotfload.module = { name = "luaotfload", - version = 2.40004, --- 2.4-3 - date = "2014/02/05", + version = 2.40005, --- 2.4-4 + date = "2014/05/18", description = "OpenType layout system.", author = "Elie Roux & Hans Hagen", copyright = "Elie Roux", @@ -288,7 +288,7 @@ local file_resolver = function (specification) local name = resolve_file (specification.name) local suffix = filesuffix(name) if formats[suffix] then - specification.forced = suffix + specification.forced = string.lower (suffix) specification.forcedname = file.removesuffix(name) else specification.name = name @@ -342,7 +342,7 @@ request_resolvers.path = function (specification) else local suffix = filesuffix (name) if formats[suffix] then - specification.forced = suffix + specification.forced = string.lower (suffix) specification.name = file.removesuffix(name) specification.forcedname = name else @@ -358,7 +358,7 @@ request_resolvers.kpse = function (specification) if suffix and formats[suffix] then name = file.removesuffix(name) if resolvers.findfile(name, suffix) then - specification.forced = suffix + specification.forced = string.lower (suffix) specification.forcedname = name return end @@ -381,7 +381,7 @@ request_resolvers.name = function (specification) if resolved then specification.resolved = resolved specification.sub = subfont - specification.forced = filesuffix (resolved) + specification.forced = string.lower (filesuffix (resolved) or "") specification.forcedname = resolved specification.name = fileremovesuffix (resolved) else diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty index 6228a3ef2a0..3d27502135b 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty @@ -29,7 +29,7 @@ \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luaotfload}% - [2014/02/05 v2.4-3 OpenType layout system] + [2014/05/18 v2.4-4 OpenType layout system] \RequirePackage{luatexbase} \fi \ifnum\luatexversion<76 -- cgit v1.2.3