From ad8c9fb7abbcd547dcc63e33abee2f2172c750eb Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Mon, 9 May 2016 07:23:40 +0200 Subject: [import,fontloader] pull new AFM/Type1 code --- scripts/mkimport | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'scripts/mkimport') diff --git a/scripts/mkimport b/scripts/mkimport index 25d7560..e2b6f72 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,7 @@ 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-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,20 +294,20 @@ 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 +--- [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-one.lua +--- [36] font-afk.lua --- [37] font-lua.lua --- [38] font-def.lua --- [39] font-xtx.lua @@ -358,8 +358,6 @@ local package = { "font-map", "fonts-syn", "font-tfm", - "font-afm", - "font-afk", "font-oti", "font-otr", "font-cff", @@ -372,6 +370,8 @@ local package = { "font-ota", "font-ots", "font-osd", + "font-one", + "font-afk", "font-lua", "font-def", "fonts-ext", -- cgit v1.2.3 From 72f10523323c3e5183f91931db56dcf38f92b68d Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 19 May 2016 08:25:34 +0200 Subject: [fontloader] include font-one.lua --- scripts/mkimport | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'scripts/mkimport') diff --git a/scripts/mkimport b/scripts/mkimport index e2b6f72..93f4b89 100755 --- a/scripts/mkimport +++ b/scripts/mkimport @@ -237,6 +237,7 @@ 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-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 }, @@ -306,13 +307,14 @@ local package = { --- [32] font-ota.lua --- [33] font-ots.lua --- [34] font-osd.lua ---- [35] font-one.lua ---- [36] font-afk.lua ---- [37] font-lua.lua ---- [38] font-def.lua ---- [39] font-xtx.lua ---- [40] luatex-fonts-ext.lua ---- [41] font-gbn.lua +--- [35] font-onr.lua +--- [36] font-one.lua +--- [37] font-afk.lua +--- [38] font-lua.lua +--- [39] font-def.lua +--- [40] font-xtx.lua +--- [41] luatex-fonts-ext.lua +--- [42] font-gbn.lua --- --- Of these, nos. 01--11 are provided by the Lualibs. Keeping them --- around in the Luaotfload fontloader is therefore unnecessary. @@ -370,6 +372,7 @@ local package = { "font-ota", "font-ots", "font-osd", + "font-onr", "font-one", "font-afk", "font-lua", -- cgit v1.2.3 From f167b470d1831575735694406eca44963f76cb3f Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 12 Jun 2016 18:18:43 +0200 Subject: [fontloader] import font-ocl Some of the more absurd aspects of fonts ;) This will fork inkscape for the actual SVG processing. --- scripts/mkimport | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'scripts/mkimport') diff --git a/scripts/mkimport b/scripts/mkimport index 93f4b89..1dc0a29 100755 --- a/scripts/mkimport +++ b/scripts/mkimport @@ -237,6 +237,7 @@ 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 }, @@ -307,14 +308,15 @@ local package = { --- [32] font-ota.lua --- [33] font-ots.lua --- [34] font-osd.lua ---- [35] font-onr.lua ---- [36] font-one.lua ---- [37] font-afk.lua ---- [38] font-lua.lua ---- [39] font-def.lua ---- [40] font-xtx.lua ---- [41] luatex-fonts-ext.lua ---- [42] font-gbn.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. @@ -372,6 +374,7 @@ local package = { "font-ota", "font-ots", "font-osd", + "font-ocl", "font-onr", "font-one", "font-afk", -- cgit v1.2.3