diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2016-04-27 23:06:27 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2016-04-27 23:06:27 +0200 |
| commit | 6c52ede0dc26bf697e5cf2732dffab7bb8191473 (patch) | |
| tree | c2425e083e73387d69afa6d349a3a3b8f19fb091 /src/fontloader/misc/fontloader-font-map.lua | |
| parent | e739376d6f7f55a74ecd215f2bd3b54a30367875 (diff) | |
| parent | 23ff1b009f3b4df6754848196d7556c11c323d83 (diff) | |
| download | luaotfload-6c52ede0dc26bf697e5cf2732dffab7bb8191473.tar.gz | |
Merge pull request #345 from phi-gamma/master
first batch of fixes
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 |