summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/mkiv/font-syn.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-16 18:18:10 +0000
committerKarl Berry <karl@freefriends.org>2016-05-16 18:18:10 +0000
commit815e54f6a349937be9afb419f12989c0b9652ab3 (patch)
tree1216f1f111c36e42860b50d3297700956b9cc40f /Master/texmf-dist/tex/context/base/mkiv/font-syn.lua
parent0f17ceebbcc6309a40823416a4a99e9ddf02dc65 (diff)
context update + remove nonfree *.icc color profiles
git-svn-id: svn://tug.org/texlive/trunk@41191 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/font-syn.lua')
-rw-r--r--Master/texmf-dist/tex/context/base/mkiv/font-syn.lua35
1 files changed, 24 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/font-syn.lua b/Master/texmf-dist/tex/context/base/mkiv/font-syn.lua
index ef0d44a843e..435aa1ddcac 100644
--- a/Master/texmf-dist/tex/context/base/mkiv/font-syn.lua
+++ b/Master/texmf-dist/tex/context/base/mkiv/font-syn.lua
@@ -565,6 +565,7 @@ local function check_name(data,result,filename,modification,suffix,subfont)
local familyname = result.familyname
local subfamilyname = result.subfamilyname
-- local compatiblename = result.compatiblename
+ -- local cfffullname = result.cfffullname
local weight = result.weight
local italicangle = tonumber(result.italicangle)
local subfont = subfont
@@ -579,6 +580,7 @@ local function check_name(data,result,filename,modification,suffix,subfont)
familyname = familyname and cleanname(familyname)
subfamilyname = subfamilyname and cleanname(subfamilyname)
-- compatiblename = compatiblename and cleanname(compatiblename)
+ -- cfffullname = cfffullname and cleanname(cfffullname)
weight = weight and cleanname(weight)
italicangle = italicangle == 0 and nil
-- analyze
@@ -630,6 +632,7 @@ local function check_name(data,result,filename,modification,suffix,subfont)
familyname = familyname,
subfamilyname = subfamilyname,
-- compatiblename = compatiblename, -- nor used / needed
+ -- cfffullname = cfffullname,
weight = weight,
style = style,
width = width,
@@ -792,18 +795,20 @@ local function collecthashes()
local nofmappings = 0
local noffallbacks = 0
if specifications then
- -- maybe multiple passes
+ -- maybe multiple passes (for the compatible and cffnames so that they have less preference)
for index=1,#specifications do
- local specification = specifications[index]
- local format = specification.format
- local fullname = specification.fullname
- local fontname = specification.fontname
- local familyname = specification.familyname or specification.family
- local subfamilyname = specification.subfamilyname
- local subfamily = specification.subfamily
- local weight = specification.weight
- local mapping = mappings[format]
- local fallback = fallbacks[format]
+ local specification = specifications[index]
+ local format = specification.format
+ local fullname = specification.fullname
+ local fontname = specification.fontname
+ -- local compatiblename = specification.compatiblename
+ -- local cfffullname = specification.cfffullname
+ local familyname = specification.familyname or specification.family
+ local subfamilyname = specification.subfamilyname
+ local subfamily = specification.subfamily
+ local weight = specification.weight
+ local mapping = mappings[format]
+ local fallback = fallbacks[format]
if fullname and not mapping[fullname] then
mapping[fullname] = index
nofmappings = nofmappings + 1
@@ -812,6 +817,14 @@ local function collecthashes()
mapping[fontname] = index
nofmappings = nofmappings + 1
end
+ -- if compatiblename and not mapping[compatiblename] then
+ -- mapping[compatiblename] = index
+ -- nofmappings = nofmappings + 1
+ -- end
+ -- if cfffullname and not mapping[cfffullname] then
+ -- mapping[cfffullname] = index
+ -- nofmappings = nofmappings + 1
+ -- end
if familyname then
if weight and weight ~= sub(familyname,#familyname-#weight+1,#familyname) then
local madename = familyname .. weight