summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-05-22 21:17:44 +0000
committerKarl Berry <karl@freefriends.org>2019-05-22 21:17:44 +0000
commit31de23b1c0c3951f92b39f6456a725219639872e (patch)
treead54074f26ea2b12205f3a515552528ae0d564b8 /Build
parent33287ebde9b1ee5d46becf889a8e562394db014e (diff)
luaotfload
git-svn-id: svn://tug.org/texlive/trunk@51190 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua28
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl67
2 files changed, 59 insertions, 36 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 a7bbf1114c8..039c282cda8 100755
--- a/Build/source/texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua
+++ b/Build/source/texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua
@@ -9,8 +9,8 @@
local ProvidesLuaModule = {
name = "luaotfload-tool",
- version = "2.96", --TAGVERSION
- date = "2019-02-14", --TAGDATE
+ version = "2.97", --TAGVERSION
+ date = "2019-05-18", --TAGDATE
description = "luaotfload-tool / database functionality",
license = "GPL v2.0"
}
@@ -70,7 +70,7 @@ do
local minimum = luaotfload.min_luatex_version
local actual = { 0, 0, 0 }
if stats then
- local major = stats.luatex_version / 100
+ local major = stats.luatex_version // 100
local minor = stats.luatex_version % 100
local revision = stats.luatex_revision --[[ : string ]]
local revno = tonumber (revision)
@@ -152,7 +152,7 @@ require "fontloader-basics-gen.lua"
texio.write, texio.write_nl = backup.write, backup.write_nl
utilities = backup.utilities
-pdf = pdf or { } --- for font-tfm
+pdf = pdf or { } --- for fonts-tfm
require "fontloader-data-con"
require "fontloader-font-ini"
@@ -162,6 +162,7 @@ require "fontloader-font-cid"
require "fontloader-font-map"
require "fontloader-font-oti"
require "fontloader-font-otr"
+require "fontloader-font-ott"
require "fontloader-font-cff"
require "fontloader-font-ttf"
require "fontloader-font-dsp"
@@ -628,7 +629,7 @@ local display_feature_set = function (set)
end
local display_features_type = function (id, feat)
- if next (feat) then
+ if feat and next (feat) then
print_heading(id, 3)
display_feature_set(feat)
return true
@@ -640,10 +641,19 @@ local display_features = function (features)
texiowrite_nl ""
print_heading("Features", 2)
- if not display_features_type ("GSUB Features", features.gsub)
- or not display_features_type ("GPOS Features", features.gpos)
- then
+ local status = 0
+ if not display_features_type ("GSUB Features", features.gsub) then
+ status = status + 1
+ end
+ if not display_features_type ("GPOS Features", features.gpos) then
+ status = status + 2
+ end
+ if status == 3 then
texiowrite_nl("font defines neither gsub nor gpos features")
+ elseif status == 2 then
+ texiowrite_nl("font defines no gpos feature")
+ elseif status == 1 then
+ texiowrite_nl("font defines no gsub feature")
end
end
@@ -1188,8 +1198,8 @@ actions.query = function (job)
end
elseif tmpspec.lookup == "file" then
needle = tmpspec.name
- subfont = tmpspec.sub
end
+ subfont = tmpspec.sub
if needle then
foundname, _, success = fonts.names.lookup_font_file (tmpspec.name)
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index f74f27cd55a..30fc0078ef0 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 51141 2019-05-16 11:18:52Z preining $
+# $Id: tlmgr.pl 51173 2019-05-21 16:35:34Z karl $
#
# Copyright 2008-2019 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 51141 $';
-my $datrev = '$Date: 2019-05-16 13:18:52 +0200 (Thu, 16 May 2019) $';
+my $svnrev = '$Revision: 51173 $';
+my $datrev = '$Date: 2019-05-21 18:35:34 +0200 (Tue, 21 May 2019) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -8619,7 +8619,7 @@ yourself if you are using this feature and want stale symlinks removed.
=item B<repository list>
-=item B<repository list I<path|tag>>
+=item B<repository list I<path|url|tag>>
=item B<repository add I<path> [I<tag>]>
@@ -8632,28 +8632,41 @@ yourself if you are using this feature and want stale symlinks removed.
This action manages the list of repositories. See L<MULTIPLE
REPOSITORIES> below for detailed explanations.
-The first form (C<list>) lists all configured repositories and the
-respective tags if set. If a path, url, or tag is given after the
-C<list> keyword, it is interpreted as source from where to
-initialize a TeX Live Database and lists the contained packages.
-This can also be an up-to-now not used repository, both locally
-and remote. If one pass in addition C<--with-platforms>, for each
-package the available platforms (if any) are listed, too.
-
-The third form (C<add>) adds a repository
-(optionally attaching a tag) to the list of repositories. The forth
-form (C<remove>) removes a repository, either by full path/url, or by
-tag. The fifth form (C<set>) sets the list of repositories to the items
-given on the command line, not keeping previous settings.
-
-The last form (C<status>) reports the verification status of the
-loaded repositories in the following format: One repository per line with
-4 fields separated with a single space: The tag (which can be the same
-as the URL), the URL, the verification code (a number), and the
-verbal description of the verification status (last field extending to
-the end of line). This format is valid under machine readable output,
-while in normal output the third field (numeric verification status)
-is not present.
+The first form, C<repository list>, lists all configured repositories
+and the respective tags if set. If a path, url, or tag is given after
+the C<list> keyword, it is interpreted as the source from which to
+initialize a TL database and lists the contained packages. This can also
+be an otherwise-unused repository, either local or remote. If the option
+C<--with-platforms> is spcified in addition, for each package the
+available platforms (if any) are also listed.
+
+The form C<repository add> adds a repository (optionally attaching a
+tag) to the list of repositories, while C<repository remove> removes a
+repository, either by full path/url, or by tag.
+
+The form C<repository set> sets the list of available repositories to
+the items given on the command line, overwriting previous settings.
+
+The form C<repository status> reports the verification status of the
+loaded repositories with the format of one repository per line
+with fields separated by a single space:
+
+=over 4
+
+=item The tag (which can be the same as the url);
+
+= the url;
+
+= iff machine-readable output is specified, the verification code (a
+number);
+
+= a textual description of the verification status, as the last field
+extending to the end of line.
+
+=back
+
+That is, in normal (not machine-readable) output, the third field
+(numeric verification status) is not present.
In all cases, one of the repositories must be tagged as C<main>;
otherwise, all operations will fail!
@@ -9830,7 +9843,7 @@ This script and its documentation were written for the TeX Live
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 51141 2019-05-16 11:18:52Z preining $
+$Id: tlmgr.pl 51173 2019-05-21 16:35:34Z karl $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html