diff options
| author | Hans Hagen <pragma@wxs.nl> | 2010-05-23 15:03:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2010-05-23 15:03:00 +0200 |
| commit | 882238ac1ea6d9563ea4e1add879f82ee8e6d9d0 (patch) | |
| tree | dc208fdf4e21e347c25f7ba55b6e29a4fca013b1 /tex/context/base/font-otf.lua | |
| parent | 767a0960d500d3e291c9e93f6737375275da564e (diff) | |
| download | context-882238ac1ea6d9563ea4e1add879f82ee8e6d9d0.tar.gz | |
beta 2010.05.23 15:03
Diffstat (limited to 'tex/context/base/font-otf.lua')
| -rw-r--r-- | tex/context/base/font-otf.lua | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tex/context/base/font-otf.lua b/tex/context/base/font-otf.lua index 2ccdc4598..d68137c96 100644 --- a/tex/context/base/font-otf.lua +++ b/tex/context/base/font-otf.lua @@ -576,7 +576,10 @@ end otf.enhancers["merge cid fonts"] = function(data,filename) -- we can also move the names to data.luatex.names which might -- save us some more memory (at the cost of harder tracing) - if data.subfonts and data.glyphs and next(data.glyphs) then + if data.subfonts then + if data.glyphs and next(data.glyphs) then + logs.report("load otf","replacing existing glyph table due to subfonts") + end local cidinfo = data.cidinfo local verbose = fonts.verbose if cidinfo.registry then @@ -1490,6 +1493,11 @@ end -- we cannot share descriptions as virtual fonts might extend them (ok, we could -- use a cache with a hash +fonts.formats.dfont = "truetype" +fonts.formats.ttc = "truetype" +fonts.formats.ttf = "truetype" +fonts.formats.otf = "opentype" + function otf.copy_to_tfm(data,cache_id) -- we can save a copy when we reorder the tma to unicode (nasty due to one->many) if data then local glyphs, pfminfo, metadata = data.glyphs or { }, data.pfminfo or { }, data.metadata or { } @@ -1570,7 +1578,7 @@ function otf.copy_to_tfm(data,cache_id) -- we can save a copy when we reorder th tfm.name = tfm.filename or tfm.fullname or tfm.fontname tfm.units = metadata.units_per_em or 1000 tfm.encodingbytes = 2 - tfm.format = (metadata.order2 == 1 and 'truetype') or 'opentype' + tfm.format = fonts.fontformat(tfm.filename,"opentype") tfm.cidinfo = data.cidinfo tfm.cidinfo.registry = tfm.cidinfo.registry or "" tfm.type = "real" |