diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2015-12-23 00:12:14 +0100 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2015-12-23 00:12:14 +0100 |
| commit | e7fc73c0cb9a56c394d12f4967dbcffe93923afd (patch) | |
| tree | 997ecb4230c241159a51d436cba4ffc49fcff8c1 /scripts | |
| parent | bd29de3d14bd6cfeb96111227f153cbccf0527a4 (diff) | |
| parent | 34a02eaaaf87f6608fc7cb13d60f1217f36f6502 (diff) | |
| download | luaotfload-e7fc73c0cb9a56c394d12f4967dbcffe93923afd.tar.gz | |
Merge pull request #315 from phi-gamma/master
third round of fixes
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mkimport | 12 | ||||
| -rwxr-xr-x | scripts/mkstatus | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/scripts/mkimport b/scripts/mkimport index b3c71fe..08537d7 100755 --- a/scripts/mkimport +++ b/scripts/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/scripts/mkstatus b/scripts/mkstatus index 4b36a9d..c5ded0d 100755 --- a/scripts/mkstatus +++ b/scripts/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", }, @@ -164,7 +164,9 @@ local git_info = function () --io.write "\n" local desc = readpipe (describecmd) if not desc then die "cannot parse git information" end - local desc = string.explode (string.fullstrip (desc), "/")[2] + desc = string.fullstrip (desc) + local desc = string.explode (desc, "/")[2] or desc + if not desc then die "cannot parse sanitized git information" end local data = readpipe (logcmd) if data and type (data) == "string" and data ~= "" then data = load (data) |