diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/luaotfload-configuration.lua | 4 | ||||
| -rw-r--r-- | src/luaotfload-database.lua | 75 | ||||
| -rw-r--r-- | src/luaotfload-loaders.lua | 1 | ||||
| -rw-r--r-- | src/luaotfload-main.lua | 6 | ||||
| -rw-r--r-- | src/luaotfload.sty | 6 |
5 files changed, 15 insertions, 77 deletions
diff --git a/src/luaotfload-configuration.lua b/src/luaotfload-configuration.lua index b901824..8faf3d1 100644 --- a/src/luaotfload-configuration.lua +++ b/src/luaotfload-configuration.lua @@ -89,7 +89,7 @@ local config_paths = { } local valid_formats = tabletohash { - "otf", "ttc", "ttf", "dfont", "afm", "pfb", "pfa", + "otf", "ttc", "ttf", "afm", --"pfb", "pfa", } local feature_presets = { @@ -188,7 +188,7 @@ local permissible_color_callbacks = { local default_config = { db = { - formats = "otf,ttf,ttc,dfont", + formats = "otf,ttf,ttc", scan_local = false, skip_read = false, strip = true, diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua index b06f3d5..135ab0e 100644 --- a/src/luaotfload-database.lua +++ b/src/luaotfload-database.lua @@ -207,9 +207,8 @@ local make_luanames = function (path) end local format_precedence = { - "otf", "ttc", "ttf", - "dfont", "afm", "pfb", - "pfa", + "otf", "ttc", "ttf", "afm", + --- "pfb", "pfa", } local location_precedence = { @@ -336,7 +335,7 @@ This is a sketch of the luaotfload db: } and metadata = { created : string // creation time - formats : string list; // { "otf", "ttf", "ttc", "dfont" } + formats : string list; // { "otf", "ttf", "ttc" } local : bool; (* set if local fonts were added to the db *) modified : string // modification time statistics : TODO; // created when built with "--stats" @@ -360,7 +359,7 @@ This is a sketch of the luaotfload db: conflicts : { barename : int; basename : int }; // filename conflict with font at index; happens with subfonts familyname : string; // sanitized name of the font family the font belongs to, usually from the names table fontname : string; // sanitized name of the font - format : string; // "otf" | "ttf" | "dfont" | "pfa" | "pfb" | "afm" + format : string; // "otf" | "ttf" | "afm" fullname : string; // sanitized full name of the font including style modifiers fullpath : string; // path to font in filesystem index : int; // index in the mappings table @@ -496,7 +495,6 @@ local lookup_fullpath local save_lookups local save_names local set_font_filter -local t1_fullinfo local update_names --- state of the database @@ -1619,74 +1617,13 @@ ot_fullinfo = function (filename, return res end ---[[doc-- - - Type1 font inspector. In comparison with OTF, PFB’s contain a good - deal less name fields which makes it tricky in some parts to find a - meaningful representation for the database. - - Good read: http://www.adobe.com/devnet/font/pdfs/5004.AFM_Spec.pdf - ---doc]]-- - ---- string -> int -> bool -> string -> fontentry - -t1_fullinfo = function (filename, _subfont, location, basename, format) - local sanitized - local metadata = load_font_file (filename) - local fontname = metadata.fontname - local fullname = metadata.fullname - local familyname = metadata.familyname - local italicangle = metadata.italicangle - local style = "" - local weight - - sanitized = sanitize_fontnames ({ - fontname = fontname, - psname = fullname, - metafamily = familyname, - familyname = familyname, - weight = metadata.weight, --- string identifier - prefmodifiers = style, - }) - - weight = sanitized.weight - - if weight == "bold" then - style = weight - end - - if italicangle ~= 0 then - style = style .. "italic" - end - - return { - basename = basename, - fullpath = filename, - subfont = false, - location = location or "system", - format = format, - fullname = sanitized.fullname, - fontname = sanitized.fontname, - familyname = sanitized.familyname, - plainname = fullname, - psname = sanitized.fontname, - version = metadata.version, - size = false, - fontstyle_name = style ~= "" and style or weight, - weight = metadata.pfminfo and pfminfo.weight or 400, - italicangle = italicangle, - } -end - local loaders = { - dfont = ot_fullinfo, otf = ot_fullinfo, ttc = ot_fullinfo, ttf = ot_fullinfo, - pfb = t1_fullinfo, - pfa = t1_fullinfo, +----pfb = t1_fullinfo, --> may come back one day, so +----pfa = t1_fullinfo, --> we keep the indirection } --- not side-effect free! diff --git a/src/luaotfload-loaders.lua b/src/luaotfload-loaders.lua index d3828aa..f0c1913 100644 --- a/src/luaotfload-loaders.lua +++ b/src/luaotfload-loaders.lua @@ -83,6 +83,7 @@ local install_formats = function () and aux ("pfa", unsupported_reader "pfa") and aux ("pfb", unsupported_reader "pfb") and aux ("ofm", readers.tfm) + and aux ("dfont", unsupported_reader "dfont") end --[[doc-- diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua index 92c1ff1..51a0657 100644 --- a/src/luaotfload-main.lua +++ b/src/luaotfload-main.lua @@ -1,7 +1,7 @@ ----------------------------------------------------------------------- -- FILE: luaotfload-main.lua -- DESCRIPTION: Luaotfload entry point --- REQUIREMENTS: luatex v.0.80 or later; packages lualibs +-- REQUIREMENTS: luatex v.0.95 or later; packages lualibs -- AUTHOR: Élie Roux, Khaled Hosny, Philipp Gesang ----------------------------------------------------------------------- -- @@ -29,8 +29,8 @@ local authors = "\z luaotfload.module = { name = "luaotfload-main", - version = 2.70001, - date = "2016/04/19", + version = 2.70002, + date = "2016/04/21", description = "OpenType layout system.", author = authors, copyright = authors, diff --git a/src/luaotfload.sty b/src/luaotfload.sty index b6f03af..8e061c2 100644 --- a/src/luaotfload.sty +++ b/src/luaotfload.sty @@ -41,10 +41,10 @@ \ProvidesPackage{luaotfload}% %% FIXME The date is meaningless, we need to find a way to %% use the git revision instead. - [2016/04/07 v2.7 OpenType layout system] + [2016/04/21 v2.7 OpenType layout system] \fi \directlua{ -require('luaotfload-main') -local _void = luaotfload.main () + require('luaotfload-main') + local _void = luaotfload.main () } |