diff options
author | Philipp Gesang <phg@phi-gamma.net> | 2016-04-21 21:40:30 +0200 |
---|---|---|
committer | Philipp Gesang <phg@phi-gamma.net> | 2016-04-21 21:40:32 +0200 |
commit | ff1cc8f4d4e1d52cc1e9df9fd01f74395c782db5 (patch) | |
tree | 70ee2aec647dcbc5e3a13f75fa84fa199fdf3d81 /src/fontloader/misc/fontloader-font-map.lua | |
parent | b1a1ee5d1ec8002acee2702e6dd070073e0ee0ee (diff) | |
download | luaotfload-ff1cc8f4d4e1d52cc1e9df9fd01f74395c782db5.tar.gz |
[fontloader] sync with Context as of 2016-04-21
Hans fixed a couple issues due to our reports. Also, brand new Lua based
PFB loader.
Diffstat (limited to 'src/fontloader/misc/fontloader-font-map.lua')
-rw-r--r-- | src/fontloader/misc/fontloader-font-map.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/fontloader/misc/fontloader-font-map.lua b/src/fontloader/misc/fontloader-font-map.lua index db501f0..509e751 100644 --- a/src/fontloader/misc/fontloader-font-map.lua +++ b/src/fontloader/misc/fontloader-font-map.lua @@ -19,6 +19,8 @@ local trace_mapping = false trackers.register("fonts.mapping", function(v) trac local report_fonts = logs.reporter("fonts","loading") -- not otf only +local force_ligatures = false directives.register("fonts.mapping.forceligatures",function(v) force_ligatures = v end) + local fonts = fonts or { } local mappings = fonts.mappings or { } fonts.mappings = mappings @@ -443,7 +445,7 @@ function mappings.addtounicode(data,filename,checklookups) local collected = false local unicoded = 0 for unicode, glyph in next, descriptions do - if not glyph.unicode and glyph.class == "ligature" then + if glyph.class == "ligature" and (force_ligatures or not glyph.unicode) then if not collected then collected = fonts.handlers.otf.readers.getcomponents(data) if not collected then |