diff options
| -rw-r--r-- | News | 2 | ||||
| -rw-r--r-- | otfl-font-def.lua | 1 | ||||
| -rw-r--r-- | otfl-font-ini.lua | 3 | ||||
| -rw-r--r-- | otfl-font-otb.lua | 9 | ||||
| -rw-r--r-- | otfl-font-otf.lua | 3 |
5 files changed, 13 insertions, 5 deletions
@@ -1,7 +1,7 @@ History of the luaotfload bundle Currrent git, luaotfload v1.07: - * synchronizing with latest ConTeXt beta 2010.02.24 + * synchronizing with latest ConTeXt beta 2010.03.12 * adding support for microtypography * adding support for color and transparency * adding a script to generate a font database with TeX and system fonts diff --git a/otfl-font-def.lua b/otfl-font-def.lua index f93a95c..0cbff06 100644 --- a/otfl-font-def.lua +++ b/otfl-font-def.lua @@ -535,6 +535,7 @@ function define.register(fontdata,id) logs.report("define font","loading at 2 id %s, hash: %s",id or "?",hash or "?") end fonts.ids[id] = fontdata + fonts.chr[id] = fontdata.characters tfm.internalized[hash] = id end end diff --git a/otfl-font-ini.lua b/otfl-font-ini.lua index 5cff227..bcf46ad 100644 --- a/otfl-font-ini.lua +++ b/otfl-font-ini.lua @@ -23,6 +23,7 @@ fontloader.totable = fontloader.to_table fonts = fonts or { } fonts.ids = fonts.ids or { } -- aka fontdata +fonts.chr = fonts.chr or { } -- aka chardata fonts.tfm = fonts.tfm or { } fonts.mode = 'base' @@ -35,6 +36,8 @@ fonts.ids[0] = { -- nullfont name = "nullfont", } +fonts.chr[0] = { } + fonts.methods = fonts.methods or { base = { tfm = { }, afm = { }, otf = { }, vtf = { }, fix = { } }, node = { tfm = { }, afm = { }, otf = { }, vtf = { }, fix = { } }, diff --git a/otfl-font-otb.lua b/otfl-font-otb.lua index 020b107..a3d3477 100644 --- a/otfl-font-otb.lua +++ b/otfl-font-otb.lua @@ -305,12 +305,13 @@ end -- to do complete mixed runs and not run featurewise (as we did before). local supported_gsub = { - 'liga','dlig','rlig','hlig', - 'pnum','onum','tnum','lnum', + 'liga', 'dlig', 'rlig', 'hlig', + 'pnum', 'onum', 'tnum', 'lnum', 'zero', - 'smcp','cpsp','c2sc','ornm','aalt', - 'hwid','fwid', + 'smcp', 'cpsp', 'c2sc', 'ornm', 'aalt', + 'hwid', 'fwid', 'ssty', 'rtlm', -- math +-- 'tlig', 'trep', } local supported_gpos = { diff --git a/otfl-font-otf.lua b/otfl-font-otf.lua index 1465e13..9aa1a3a 100644 --- a/otfl-font-otf.lua +++ b/otfl-font-otf.lua @@ -87,6 +87,9 @@ otf.notdef = false otf.cache = containers.define("fonts", "otf", otf.version, true) otf.cleanup_aat = false -- only context +local wildcard = "*" +local default = "dflt" + --[[ldx-- <p>We start with a lot of tables and related functions.</p> --ldx]]-- |