From ad8c9fb7abbcd547dcc63e33abee2f2172c750eb Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Mon, 9 May 2016 07:23:40 +0200
Subject: [import,fontloader] pull new AFM/Type1 code

---
 scripts/mkimport | 34 +++++++++++++++++-----------------
 scripts/mkstatus |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'scripts')

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",
diff --git a/scripts/mkstatus b/scripts/mkstatus
index f9ff7eb..6a05833 100755
--- a/scripts/mkstatus
+++ b/scripts/mkstatus
@@ -84,7 +84,7 @@ 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-one.lua",        },
   { miscdir,      "fontloader-font-cid.lua",        },
   { miscdir,      "fontloader-font-con.lua",        },
   { miscdir,      "fontloader-font-def.lua",        },
-- 
cgit v1.2.3