summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2016-07-14 07:36:01 +0200
committerGitHub <noreply@github.com>2016-07-14 07:36:01 +0200
commit8bb332a20022d100dcbd64fc416a35673a0ba879 (patch)
treef972c96ccf326053729544d32fda11fc14de2115 /scripts
parent2b26f1507fb78927be50bea4ff5b13c5d897cc53 (diff)
parent6ae6f2dec61a216b584e59b6953f0576f51c3902 (diff)
downloadluaotfload-8bb332a20022d100dcbd64fc416a35673a0ba879.tar.gz
Merge pull request #369 from phi-gamma/master
New TFM code
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/mkimport5
-rwxr-xr-xscripts/mkstatus2
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/mkimport b/scripts/mkimport
index 1dc0a29..c06594b 100755
--- a/scripts/mkimport
+++ b/scripts/mkimport
@@ -223,6 +223,7 @@ local imports = {
{ name = "swiglib-test" , ours = nil , kind = kind_ignored },
{ name = "swiglib-test" , ours = nil , kind = kind_tex },
{ name = "test" , ours = nil , kind = kind_tex },
+ { name = "plain-tfm" , ours = nil , kind = kind_ignored },
}, --[[ [fontloader] ]]
context = { --=> all merged
@@ -295,7 +296,6 @@ local package = {
--- [19] font-cid.lua
--- [20] font-map.lua
--- [21] luatex-fonts-syn.lua
---- [22] font-tfm.lua
--- [23] font-oti.lua
--- [24] font-otr.lua
--- [25] font-cff.lua
@@ -312,6 +312,7 @@ local package = {
--- [36] font-onr.lua
--- [37] font-one.lua
--- [38] font-afk.lua
+--- [22] font-tfm.lua
--- [39] font-lua.lua
--- [40] font-def.lua
--- [41] font-xtx.lua
@@ -361,7 +362,6 @@ local package = {
"font-cid",
"font-map",
"fonts-syn",
- "font-tfm",
"font-oti",
"font-otr",
"font-cff",
@@ -378,6 +378,7 @@ local package = {
"font-onr",
"font-one",
"font-afk",
+ "font-tfm",
"font-lua",
"font-def",
"fonts-ext",
diff --git a/scripts/mkstatus b/scripts/mkstatus
index 10f6680..f761213 100755
--- a/scripts/mkstatus
+++ b/scripts/mkstatus
@@ -101,7 +101,6 @@ local names = {
{ miscdir, "fontloader-font-lua.lua", },
{ miscdir, "fontloader-fonts-syn.lua", },
{ miscdir, "fontloader-font-tfm.lua", },
- { miscdir, "fontloader-font-tfm.lua", },
{ miscdir, "fontloader-font-otr.lua", },
{ miscdir, "fontloader-font-cff.lua", },
{ miscdir, "fontloader-font-ttf.lua", },
@@ -114,6 +113,7 @@ local names = {
{ miscdir, "fontloader-font-ots.lua", },
{ miscdir, "fontloader-font-osd.lua", },
{ miscdir, "fontloader-font-ocl.lua", },
+ { miscdir, "fontloader-plain-tfm.lua", },
--- lua libraries
{ miscdir, "fontloader-languages.lua", },