summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/luaotfload
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-12-23 23:45:40 +0000
committerKarl Berry <karl@freefriends.org>2015-12-23 23:45:40 +0000
commit46395f08db1fd908b63f6ca929f985ed12468dcc (patch)
tree26408d81693ab74a3f80dac383d06a4e49c56b8f /Master/texmf-dist/scripts/luaotfload
parentb361149a3534bd565a40b031860524b7d7e56c76 (diff)
luaotfload (23dec15)
git-svn-id: svn://tug.org/texlive/trunk@39184 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/luaotfload')
-rwxr-xr-xMaster/texmf-dist/scripts/luaotfload/mkimport12
-rwxr-xr-xMaster/texmf-dist/scripts/luaotfload/mkstatus9
2 files changed, 12 insertions, 9 deletions
diff --git a/Master/texmf-dist/scripts/luaotfload/mkimport b/Master/texmf-dist/scripts/luaotfload/mkimport
index b3c71fedf24..08537d7d284 100755
--- a/Master/texmf-dist/scripts/luaotfload/mkimport
+++ b/Master/texmf-dist/scripts/luaotfload/mkimport
@@ -196,11 +196,9 @@ local imports = {
{ name = "fonts-demo-vf-1" , ours = nil , kind = kind_ignored },
{ name = "fonts-enc" , ours = nil , kind = kind_merged },
{ name = "fonts-ext" , ours = nil , kind = kind_merged },
- { name = "fonts-inj" , ours = nil , kind = kind_merged },
{ name = "fonts-lua" , ours = nil , kind = kind_merged },
{ name = "fonts-merged" , ours = "reference" , kind = kind_essential },
{ name = "fonts-ota" , ours = nil , kind = kind_merged },
- { name = "fonts-otn" , ours = nil , kind = kind_merged },
{ name = "fonts" , ours = nil , kind = kind_merged },
{ name = "fonts" , ours = nil , kind = kind_tex },
{ name = "fonts-syn" , ours = nil , kind = kind_ignored },
@@ -230,10 +228,12 @@ local imports = {
{ name = "font-con" , ours = "font-con" , kind = kind_merged },
{ name = "font-def" , ours = "font-def" , kind = kind_merged },
{ name = "font-ini" , ours = "font-ini" , kind = kind_merged },
+ { name = "font-inj" , ours = "font-inj" , kind = kind_merged },
{ name = "font-map" , ours = "font-map" , kind = kind_merged },
{ name = "font-otb" , ours = "font-otb" , kind = kind_merged },
{ name = "font-otf" , ours = "font-otf" , kind = kind_merged },
{ name = "font-oti" , ours = "font-oti" , kind = kind_merged },
+ { name = "font-otn" , ours = "font-otn" , kind = kind_merged },
{ name = "font-otp" , ours = "font-otp" , kind = kind_merged },
{ name = "font-tfm" , ours = "font-tfm" , kind = kind_merged },
{ name = "l-boolean" , ours = "l-boolean" , kind = kind_lualibs },
@@ -282,9 +282,9 @@ local package = {
--- [24] font-oti.lua
--- [25] font-otf.lua
--- [26] font-otb.lua
---- [27] luatex-fonts-inj.lua
+--- [27] font-inj.lua
--- [28] luatex-fonts-ota.lua
---- [29] luatex-fonts-otn.lua
+--- [30] font-otn.lua
--- [30] font-otp.lua
--- [31] luatex-fonts-lua.lua
--- [32] font-def.lua
@@ -336,9 +336,9 @@ local package = {
"font-oti",
"font-otf",
"font-otb",
- "fonts-inj",
+ "font-inj",
"fonts-ota",
- "fonts-otn",
+ "font-otn",
"font-otp",
"fonts-lua",
"font-def",
diff --git a/Master/texmf-dist/scripts/luaotfload/mkstatus b/Master/texmf-dist/scripts/luaotfload/mkstatus
index 4b36a9dc8fc..07ec22990fa 100755
--- a/Master/texmf-dist/scripts/luaotfload/mkstatus
+++ b/Master/texmf-dist/scripts/luaotfload/mkstatus
@@ -101,11 +101,11 @@ local names = {
{ miscdir, "fontloader-fonts-demo-vf-1.lua", },
{ miscdir, "fontloader-fonts-enc.lua", },
{ miscdir, "fontloader-fonts-ext.lua", },
- { miscdir, "fontloader-fonts-inj.lua", },
+ { miscdir, "fontloader-font-inj.lua", },
{ miscdir, "fontloader-fonts.lua", },
{ miscdir, "fontloader-fonts-lua.lua", },
{ miscdir, "fontloader-fonts-ota.lua", },
- { miscdir, "fontloader-fonts-otn.lua", },
+ { miscdir, "fontloader-font-otn.lua", },
{ miscdir, "fontloader-fonts-syn.lua", },
{ miscdir, "fontloader-fonts-tfm.lua", },
{ miscdir, "fontloader-font-tfm.lua", },
@@ -163,8 +163,11 @@ local git_info = function ()
--io.write (logcmd)
--io.write "\n"
local desc = readpipe (describecmd)
+ inspect(desc)
+ if not desc then die "cannot parse git information" end
+ desc = string.fullstrip (desc)
+ local desc = string.explode (desc, "/")[2] or desc
if not desc then die "cannot parse git information" end
- local desc = string.explode (string.fullstrip (desc), "/")[2]
local data = readpipe (logcmd)
if data and type (data) == "string" and data ~= "" then
data = load (data)