diff options
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua | 21 | ||||
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 12 | ||||
-rw-r--r-- | Master/texmf-dist/doc/luatex/luaotfload/NEWS | 5 | ||||
-rw-r--r-- | Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf | bin | 222160 -> 222173 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/luaotfload-tool.1 | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf | bin | 15434 -> 15440 bytes | |||
-rwxr-xr-x | Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua | 21 | ||||
-rw-r--r-- | Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx | 18 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua | 33 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/luaotfload-override.lua | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty | 4 |
13 files changed, 94 insertions, 50 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua b/Build/source/texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua index fd84fa4701d..67ab2e7f1b6 100755 --- a/Build/source/texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua +++ b/Build/source/texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua @@ -2,14 +2,14 @@ ----------------------------------------------------------------------- -- FILE: luaotfload-tool.lua -- DESCRIPTION: database functionality --- REQUIREMENTS: luaotfload 2.2 +-- REQUIREMENTS: luaotfload 2.4 -- AUTHOR: Khaled Hosny, Élie Roux, Philipp Gesang --- VERSION: 2.4 +-- VERSION: 2.4-3 -- LICENSE: GPL v2 -- MODIFIED: 2013-07-28 13:12:04+0200 ----------------------------------------------------------------------- -local version = "2.4" --- <int: major>.<int: minor><alpha: fixes> +local version = "2.4-3" --- <int: major>.<int: minor><alpha: fixes> --[[doc-- @@ -191,12 +191,13 @@ local help_messages = { Usage: %s [OPTIONS...] -Operations on the Luaotfload font names database. + Luaotfload font management and diagnostic utility. + This program is part of the Luaotfload package. -This tool is part of the luaotfload package. Valid options are: + Valid options are: ------------------------------------------------------------------------------- - VERBOSITY AND LOGGING + VERBOSITY AND DIAGNOSTICS -q --quiet don't output anything -v --verbose=LEVEL be more verbose (print the searched directories) @@ -302,8 +303,16 @@ local help_msg = function (version) luaotfloadconfig.cache_dir))) end +local about = [[ +%s: + Luaotfload font management and diagnostic utility. + License: GNU GPL v2.0. + Report problems to <https://github.com/lualatex/luaotfload/issues> +]] + local version_msg = function ( ) local out = function (...) texiowrite_nl (stringformat (...)) end + out (about, luaotfloadconfig.self) out ("%s version %q", luaotfloadconfig.self, version) out ("revision %q", luaotfloadstatus.notes.revision) out ("database version %q", names.version) diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 25b27d4ec65..7a61e7d04b8 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 31977 2013-10-23 14:04:44Z preining $ +# $Id: tlmgr.pl 32771 2014-01-24 00:28:32Z karl $ # # Copyright 2008-2013 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 31977 $'; -my $datrev = '$Date: 2013-10-23 16:04:44 +0200 (Wed, 23 Oct 2013) $'; +my $svnrev = '$Revision: 32771 $'; +my $datrev = '$Date: 2014-01-24 01:28:32 +0100 (Fri, 24 Jan 2014) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -5892,14 +5892,14 @@ sub check_for_critical_updates sub critical_updates_warning { tlwarn("=" x 79, "\n"); - tlwarn("Updates for tlmgr itself are present.\n"); - tlwarn("So, please update the package manager first, via either\n"); + tlwarn("tlmgr itself needs to be updated.\n"); + tlwarn("Please do this via either\n"); tlwarn(" tlmgr update --self\n"); tlwarn("or by getting the latest updater for Unix-ish systems:\n"); tlwarn(" $TeXLiveURL/update-tlmgr-latest.sh\n"); tlwarn("and/or Windows systems:\n"); tlwarn(" $TeXLiveURL/update-tlmgr-latest.exe\n"); - tlwarn("Then continue with other updates.\n"); + tlwarn("Then continue with other updates as usual.\n"); tlwarn("=" x 79, "\n"); } diff --git a/Master/texmf-dist/doc/luatex/luaotfload/NEWS b/Master/texmf-dist/doc/luatex/luaotfload/NEWS index b8f380d8883..01958358023 100644 --- a/Master/texmf-dist/doc/luatex/luaotfload/NEWS +++ b/Master/texmf-dist/doc/luatex/luaotfload/NEWS @@ -1,6 +1,11 @@ Change History -------------- +2014/02/05, luaotfload v2.4-3 + * Add contact info to --version output of luaotfload-tool (backport from + 2.5). + * Fix bug with broken font names (backport from 2.5). + 2013/12/31, luaotfload v2.4 * Additional self-tests, now in separate file (luaotfload-diagnostics.lua) * Better path and directory handling, especially on Windows diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf Binary files differindex 2081be708d1..d048643e15b 100644 --- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf +++ b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf diff --git a/Master/texmf-dist/doc/man/man1/luaotfload-tool.1 b/Master/texmf-dist/doc/man/man1/luaotfload-tool.1 index 5d4ad3176c5..40ad91ad78a 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 "2013-07-31" "2.4" "text processing" +.TH LUAOTFLOAD-TOOL 1 "2014-02-05" "2.4-3" "text processing" .SH NAME luaotfload-tool \- generate and query the Luaotfload font names database . @@ -284,7 +284,7 @@ automatically (\fBexperimental!\fP). .UNINDENT .TP .B \-\-version\fP,\fB \-V -Show version number and exit. +Show version info of components and exit. .TP .B \-\-help\fP,\fB \-h Show help message and exit. diff --git a/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf b/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf Binary files differindex ab20f593657..07ad2ffb9be 100644 --- a/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf diff --git a/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua b/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua index fd84fa4701d..67ab2e7f1b6 100755 --- a/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua +++ b/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua @@ -2,14 +2,14 @@ ----------------------------------------------------------------------- -- FILE: luaotfload-tool.lua -- DESCRIPTION: database functionality --- REQUIREMENTS: luaotfload 2.2 +-- REQUIREMENTS: luaotfload 2.4 -- AUTHOR: Khaled Hosny, Élie Roux, Philipp Gesang --- VERSION: 2.4 +-- VERSION: 2.4-3 -- LICENSE: GPL v2 -- MODIFIED: 2013-07-28 13:12:04+0200 ----------------------------------------------------------------------- -local version = "2.4" --- <int: major>.<int: minor><alpha: fixes> +local version = "2.4-3" --- <int: major>.<int: minor><alpha: fixes> --[[doc-- @@ -191,12 +191,13 @@ local help_messages = { Usage: %s [OPTIONS...] -Operations on the Luaotfload font names database. + Luaotfload font management and diagnostic utility. + This program is part of the Luaotfload package. -This tool is part of the luaotfload package. Valid options are: + Valid options are: ------------------------------------------------------------------------------- - VERBOSITY AND LOGGING + VERBOSITY AND DIAGNOSTICS -q --quiet don't output anything -v --verbose=LEVEL be more verbose (print the searched directories) @@ -302,8 +303,16 @@ local help_msg = function (version) luaotfloadconfig.cache_dir))) end +local about = [[ +%s: + Luaotfload font management and diagnostic utility. + License: GNU GPL v2.0. + Report problems to <https://github.com/lualatex/luaotfload/issues> +]] + local version_msg = function ( ) local out = function (...) texiowrite_nl (stringformat (...)) end + out (about, luaotfloadconfig.self) out ("%s version %q", luaotfloadconfig.self, version) out ("revision %q", luaotfloadstatus.notes.revision) out ("database version %q", names.version) diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx index 08f56af43bc..40b5df93400 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-2013 +% Copyright (C) 2009-2014 % by Elie Roux <elie.roux@telecom-bretagne.eu> % and Khaled Hosny <khaledhosny@eglug.org> % and Philipp Gesang <philipp.gesang@alumni.uni-heidelberg.de> @@ -40,7 +40,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: luaotfload v2.4 OpenType layout system} +\Msg{* Package: luaotfload v2.4-3 OpenType layout system} \Msg{************************************************************************} \keepsilent @@ -51,7 +51,7 @@ \preamble This is a generated file. -Copyright (C) 2009-2013 +Copyright (C) 2009-2014 by Elie Roux <elie.roux@telecom-bretagne.eu> and Khaled Hosny <khaledhosny@eglug.org> and Philipp Gesang <philipp.gesang@alumni.uni-heidelberg.de> @@ -111,7 +111,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{luaotfload.drv}% - [2013/12/28 v2.4 OpenType layout system]% + [2014/02/05 v2.4-3 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{2013/12/28 v2.4} +% \date{2014/02/05 v2.4-3} % \author{Elie Roux · Khaled Hosny · Philipp Gesang\\ % Home: \url{https://github.com/lualatex/luaotfload}\\ % Support: \email{lualatex-dev@tug.org}} @@ -1595,7 +1595,7 @@ config.luaotfload = config.luaotfload or { } config.luaotfload.resolver = config.luaotfload.resolver or "cached" config.luaotfload.definer = config.luaotfload.definer or "patch" config.luaotfload.compatibility = config.luaotfload.compatibility or false -config.luaotfload.loglevel = config.luaotfload.loglevel or 1 +config.luaotfload.loglevel = config.luaotfload.loglevel or 2 config.luaotfload.color_callback = config.luaotfload.color_callback or "pre_linebreak_filter" config.luaotfload.prioritize = config.luaotfload.prioritize or "sys" config.luaotfload.names_dir = config.luaotfload.names_dir or "names" @@ -1608,8 +1608,8 @@ end luaotfload.module = { name = "luaotfload", - version = 2.40003, - date = "2013/12/28", + version = 2.40004, --- 2.4-3 + date = "2014/02/05", description = "OpenType layout system.", author = "Elie Roux & Hans Hagen", copyright = "Elie Roux", @@ -2233,7 +2233,7 @@ luaotfload.aux.start_rewrite_fontname () --- to be migrated to fontspec \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luaotfload}% - [2013/12/28 v2.4 OpenType layout system] + [2014/02/05 v2.4-3 OpenType layout system] \RequirePackage{luatexbase} \fi \ifnum\luatexversion<76 diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua index 9d7d9121d4c..cb3ec330e35 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua @@ -132,7 +132,7 @@ luaotfloadconfig.compress = luaotfloadconfig.compress ~= false local names = fonts.names local name_index = nil --> upvalue for names.data local lookup_cache = nil --> for names.lookups -names.version = 2.4 +names.version = 2.41 names.data = nil --- contains the loaded database names.lookups = nil --- contains the lookup cache @@ -1070,9 +1070,10 @@ local resolve_fontname = function (specification, name, style) local face = mappings [i] local prefmodifiers = face.prefmodifiers local subfamily = face.subfamily - if face.fontname == name - or face.fullname == name - or face.psname == name + if face.fontname == name + or face.splainname == name + or face.fullname == name + or face.psname == name then return face.basename, face.subfont elseif face.familyname == name then @@ -1394,16 +1395,26 @@ local get_english_names = function (names, basename) report("log", 1, "db", "Broken font %s rejected due to missing names table.", basename) - return nil end - return english_names + return english_names or { } end local organize_namedata = function (metadata, english_names, basename, info) + local default_name = english_names.compatfull + or english_names.fullname + or english_names.postscriptname + or metadata.fullname + or metadata.fontname + or info.fullname --- TODO check if fontloader.info() is ready for prime + or info.fontname + local default_family = english_names.preffamily + or english_names.family + or metadata.familyname + or info.familyname local fontnames = { --- see --- https://developer.apple.com/fonts/TTRefMan/RM06/Chap6name.html @@ -1419,14 +1430,15 @@ local organize_namedata = function (metadata, --- However, in some fonts (e.g. CMU) all three fields are --- identical. fullname = --[[ 18 ]] english_names.compatfull - or --[[ 4 ]] english_names.fullname, + or --[[ 4 ]] english_names.fullname + or default_name, --- we keep both the “preferred family” and the “family” --- values around since both are valid but can turn out --- quite differently, e.g. with Latin Modern: --- preffamily: “Latin Modern Sans”, --- family: “LM Sans 10” preffamily = --[[ 16 ]] english_names.preffamilyname, - family = --[[ 1 ]] english_names.family, + family = --[[ 1 ]] english_names.family or default_family, prefmodifiers = --[[ 17 ]] english_names.prefmodifiers, subfamily = --[[ 2 ]] english_names.subfamily, psname = --[[ 6 ]] english_names.postscriptname, @@ -1608,6 +1620,7 @@ t1_fullinfo = function (filename, _subfont, location, basename, format) fontname = sanitized.fontname, familyname = sanitized.familyname, plainname = fullname, + splainname = sanitized.fullname, psname = sanitized.fontname, version = metadata.version, size = false, @@ -2775,6 +2788,7 @@ local pull_values = function (entry) entry.psname = english.psname entry.fontname = info.fontname entry.fullname = english.fullname or info.fullname + entry.splainname = metadata.fullname entry.prefmodifiers = english.prefmodifiers local metafamily = metadata.familyname local familyname = english.preffamily or english.family @@ -2800,6 +2814,9 @@ local pull_values = function (entry) end local add_family = function (name, subtable, modifier, entry) + if not name then + return + end local familytable = subtable [name] if not familytable then familytable = { } diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-override.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-override.lua index b1773fa0406..fe70dcb4209 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-override.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-override.lua @@ -166,6 +166,8 @@ if texjob == true then statusln = function (str) if first_status == false then iowrite (kill_line) + else + iowrite "\n" end iowrite (str) end @@ -326,7 +328,9 @@ end local status_stop = function (...) if first_status == false then status_writer(...) - writeln "" + if texjob == false then + writeln "" + end end end diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua index 33b68e79aca..4d63544b6e1 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua @@ -3,10 +3,10 @@ return { { "mkstatus", "51af30205d30c2b7f5bfd5169d9911a0" }, { "mkglyphlist", "a8d64d29927ad8aebd1280a11d335895" }, { "mkcharacters", "f25363cbe04fc5f1210930a10635247f" }, - { "luaotfload-tool.lua", "eb34dc11cc91c01de4626bba5ff9ae17" }, - { "luaotfload-override.lua", "b878d157af7147e30a067a41d3ea3cfe" }, + { "luaotfload-tool.lua", "978fc97d7f3e60cc36a56e4375aabebb" }, + { "luaotfload-override.lua", "d0e40ea83d625813aa0fe2f9e76d8ef5" }, { "luaotfload-fontloader.lua", "21b625efe6630b76250e18f7d2832cff" }, - { "luaotfload.lua", "c12b302cc953e59476c6cf6ca129a233" }, + { "luaotfload.lua", "fe691a3a26e3d2dc8d9a04df63e8fe68" }, { "luaotfload-loaders.lua", "b04c6d9aa2974d56895fe3dff3fea90d" }, { "luaotfload-letterspace.lua", "19e6181076dda7c8c34e7096cee1f873" }, { "luaotfload-glyphlist.lua", "ff440162d1b8a78a586375ee65630c21" }, @@ -18,7 +18,7 @@ return { { "luaotfload-fonts-cbk.lua", "c1b7a4e5508d68f45a99cdc38c2d0885" }, { "luaotfload-features.lua", "0d97a50852fb55be4133874c8f487832" }, { "luaotfload-diagnostics.lua", "eed12e7b7fe6545daa6786fed1405a4f" }, - { "luaotfload-database.lua", "0ddcdd44409cad8cf4c206d5e8d40e31" }, + { "luaotfload-database.lua", "db8d9e939910a7fce9b811546edd95c2" }, { "luaotfload-colors.lua", "248c4c42586c17e934a4d046c3c873b9" }, { "luaotfload-characters.lua", "2673ffb19e8505af4782aad437a76a4f" }, { "luaotfload-basics-nod.lua", "d6b26ec86c0b1c1516936b425df04432" }, @@ -27,7 +27,7 @@ return { }, ["notes"]={ ["committer"]="Philipp Gesang <phg42.2a@gmail.com>", - ["revision"]="5b26498993e9e0e9ba4759ceb3976b17f42d1413", - ["timestamp"]="2014-01-03 18:17:16 +0100", + ["revision"]="bd307a8fe8047d322317037c1a832720c236fb48", + ["timestamp"]="2014-02-05 21:06:28 +0100", }, }
\ 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 73fb0172a1d..bbfe444eb9f 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-2013 +-- Copyright (C) 2009-2014 -- by Elie Roux <elie.roux@telecom-bretagne.eu> -- and Khaled Hosny <khaledhosny@eglug.org> -- and Philipp Gesang <philipp.gesang@alumni.uni-heidelberg.de> @@ -30,7 +30,7 @@ config.luaotfload = config.luaotfload or { } config.luaotfload.resolver = config.luaotfload.resolver or "cached" config.luaotfload.definer = config.luaotfload.definer or "patch" config.luaotfload.compatibility = config.luaotfload.compatibility or false -config.luaotfload.loglevel = config.luaotfload.loglevel or 1 +config.luaotfload.loglevel = config.luaotfload.loglevel or 2 config.luaotfload.color_callback = config.luaotfload.color_callback or "pre_linebreak_filter" config.luaotfload.prioritize = config.luaotfload.prioritize or "sys" config.luaotfload.names_dir = config.luaotfload.names_dir or "names" @@ -43,8 +43,8 @@ end luaotfload.module = { name = "luaotfload", - version = 2.40003, - date = "2013/12/28", + version = 2.40004, --- 2.4-3 + date = "2014/02/05", description = "OpenType layout system.", author = "Elie Roux & Hans Hagen", copyright = "Elie Roux", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty index 6a5afdba02d..6228a3ef2a0 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-2013 +%% Copyright (C) 2009-2014 %% by Elie Roux <elie.roux@telecom-bretagne.eu> %% and Khaled Hosny <khaledhosny@eglug.org> %% and Philipp Gesang <philipp.gesang@alumni.uni-heidelberg.de> @@ -29,7 +29,7 @@ \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luaotfload}% - [2013/12/28 v2.4 OpenType layout system] + [2014/02/05 v2.4-3 OpenType layout system] \RequirePackage{luatexbase} \fi \ifnum\luatexversion<76 |