diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2016-06-15 00:02:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 00:02:42 +0200 |
| commit | 36cc5c9c567e24916f254203fc362bf124e26d02 (patch) | |
| tree | 56cdd0a401ffbb99e8702f47a7865677b0971a8e /scripts | |
| parent | 17fbf1d1c26047f1e0e80fc6e5f3331f6183a795 (diff) | |
| parent | ba744a4bce3ed03eefbf2b4746fa24e6d388d9ff (diff) | |
| download | luaotfload-36cc5c9c567e24916f254203fc362bf124e26d02.tar.gz | |
Merge pull request #364 from phi-gamma/master
fixes, 3rd edition
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mkimport | 50 | ||||
| -rwxr-xr-x | scripts/mkstatus | 4 |
2 files changed, 31 insertions, 23 deletions
diff --git a/scripts/mkimport b/scripts/mkimport index 25d7560..1dc0a29 100755 --- a/scripts/mkimport +++ b/scripts/mkimport @@ -228,7 +228,6 @@ local imports = { context = { --=> all merged { name = "data-con" , ours = "data-con" , kind = kind_merged }, { name = "font-afk" , ours = "font-afk" , kind = kind_merged }, - { name = "font-afm" , ours = "font-afm" , kind = kind_merged }, { name = "font-cff" , ours = "font-cff" , kind = kind_merged }, { name = "font-cid" , ours = "font-cid" , kind = kind_merged }, { name = "font-con" , ours = "font-con" , kind = kind_merged }, @@ -238,6 +237,9 @@ local imports = { { name = "font-ini" , ours = "font-ini" , kind = kind_merged }, { name = "font-lua" , ours = "font-lua" , kind = kind_merged }, { name = "font-map" , ours = "font-map" , kind = kind_merged }, + { name = "font-ocl" , ours = "font-ocl" , kind = kind_merged }, + { name = "font-onr" , ours = "font-onr" , kind = kind_merged }, + { name = "font-one" , ours = "font-one" , kind = kind_merged }, { name = "font-osd" , ours = "font-osd" , kind = kind_merged }, { name = "font-ota" , ours = "font-ota" , kind = kind_merged }, { name = "font-otd" , ours = "font-otd" , kind = kind_merged }, @@ -294,25 +296,27 @@ local package = { --- [20] font-map.lua --- [21] luatex-fonts-syn.lua --- [22] font-tfm.lua ---- [23] font-afm.lua ---- [24] font-afk.lua ---- [25] font-oti.lua ---- [26] font-otr.lua ---- [27] font-cff.lua ---- [28] font-ttf.lua ---- [29] font-dsp.lua ---- [30] font-oup.lua ---- [31] font-otl.lua ---- [32] font-oto.lua ---- [33] font-otj.lua ---- [34] font-ota.lua ---- [35] font-ots.lua ---- [36] font-osd.lua ---- [37] font-lua.lua ---- [38] font-def.lua ---- [39] font-xtx.lua ---- [40] luatex-fonts-ext.lua ---- [41] font-gbn.lua +--- [23] font-oti.lua +--- [24] font-otr.lua +--- [25] font-cff.lua +--- [26] font-ttf.lua +--- [27] font-dsp.lua +--- [28] font-oup.lua +--- [29] font-otl.lua +--- [30] font-oto.lua +--- [31] font-otj.lua +--- [32] font-ota.lua +--- [33] font-ots.lua +--- [34] font-osd.lua +--- [35] font-ocl.lua +--- [36] font-onr.lua +--- [37] font-one.lua +--- [38] font-afk.lua +--- [39] font-lua.lua +--- [40] font-def.lua +--- [41] font-xtx.lua +--- [42] luatex-fonts-ext.lua +--- [43] font-gbn.lua --- --- Of these, nos. 01--11 are provided by the Lualibs. Keeping them --- around in the Luaotfload fontloader is therefore unnecessary. @@ -358,8 +362,6 @@ local package = { "font-map", "fonts-syn", "font-tfm", - "font-afm", - "font-afk", "font-oti", "font-otr", "font-cff", @@ -372,6 +374,10 @@ local package = { "font-ota", "font-ots", "font-osd", + "font-ocl", + "font-onr", + "font-one", + "font-afk", "font-lua", "font-def", "fonts-ext", diff --git a/scripts/mkstatus b/scripts/mkstatus index f9ff7eb..10f6680 100755 --- a/scripts/mkstatus +++ b/scripts/mkstatus @@ -84,7 +84,8 @@ local names = { { miscdir, "fontloader-basics-nod.lua", }, { miscdir, "fontloader-data-con.lua", }, { miscdir, "fontloader-font-afk.lua", }, - { miscdir, "fontloader-font-afm.lua", }, + { miscdir, "fontloader-font-onr.lua", }, + { miscdir, "fontloader-font-one.lua", }, { miscdir, "fontloader-font-cid.lua", }, { miscdir, "fontloader-font-con.lua", }, { miscdir, "fontloader-font-def.lua", }, @@ -112,6 +113,7 @@ local names = { { miscdir, "fontloader-font-ota.lua", }, { miscdir, "fontloader-font-ots.lua", }, { miscdir, "fontloader-font-osd.lua", }, + { miscdir, "fontloader-font-ocl.lua", }, --- lua libraries { miscdir, "fontloader-languages.lua", }, |