summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luaotfload/fontloader-font-con.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-02-25 22:22:50 +0000
committerKarl Berry <karl@freefriends.org>2019-02-25 22:22:50 +0000
commitab8a74099e59b1e4a16672820198419ae0b07ce0 (patch)
tree8d61990071fa5f5c8c375dc4b2b308ca4d0734c4 /Master/texmf-dist/tex/luatex/luaotfload/fontloader-font-con.lua
parentc0f152092e12b8eb497c5d9e206a8fc1ad9ed5c2 (diff)
luaotfload (25feb19)
git-svn-id: svn://tug.org/texlive/trunk@50131 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luaotfload/fontloader-font-con.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/fontloader-font-con.lua22
1 files changed, 16 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/fontloader-font-con.lua b/Master/texmf-dist/tex/luatex/luaotfload/fontloader-font-con.lua
index 81ea7c859cf..9f85ee20839 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/fontloader-font-con.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/fontloader-font-con.lua
@@ -49,6 +49,8 @@ constructors.cache = containers.define("fonts", "constructors", constr
constructors.privateoffset = fonts.privateoffsets.textbase or 0xF0000
constructors.cacheintex = true -- so we see the original table in fonts.font
+constructors.addtounicode = true
+
-- This might become an interface:
local designsizes = allocate()
@@ -424,6 +426,8 @@ function constructors.scale(tfmdata,specification)
targetparameters.forcedsize = forcedsize -- context specific
targetparameters.extrafactor = extrafactor -- context specific
--
+ local addtounicode = constructors.addtounicode
+ --
local tounicode = fonts.mappings.tounicode
local unknowncode = tounicode(0xFFFD)
--
@@ -736,13 +740,19 @@ function constructors.scale(tfmdata,specification)
end
end
local isunicode = description.unicode
- if isunicode then
- chr.unicode = isunicode
- chr.tounicode = tounicode(isunicode)
- -- in luatex > 0.85 we can do this:
- -- chr.tounicode = isunicode
+ if addtounicode then
+ if isunicode then
+ chr.unicode = isunicode
+ chr.tounicode = tounicode(isunicode)
+ -- in luatex > 0.85 we can do this:
+ -- chr.tounicode = isunicode
+ else
+ chr.tounicode = unknowncode
+ end
else
- chr.tounicode = unknowncode
+ if isunicode then
+ chr.unicode = isunicode
+ end
end
if hasquality then
-- we could move these calculations elsewhere (saves calculations)