diff options
| author | Hans Hagen <pragma@wxs.nl> | 2012-07-27 16:41:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2012-07-27 16:41:00 +0200 |
| commit | 2a3ad7522fdc055a3c0027d830b30d097017ec2c (patch) | |
| tree | 5e641dc82453b73ef858cb2f98fc324a4153d278 /tex/context/base/font-ctx.lua | |
| parent | 07f9052e9f88459a4ee947f6c01d9de1119b8355 (diff) | |
| download | context-2a3ad7522fdc055a3c0027d830b30d097017ec2c.tar.gz | |
beta 2012.07.27 16:41
Diffstat (limited to 'tex/context/base/font-ctx.lua')
| -rw-r--r-- | tex/context/base/font-ctx.lua | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tex/context/base/font-ctx.lua b/tex/context/base/font-ctx.lua index 8fdb42c7d..1badc090d 100644 --- a/tex/context/base/font-ctx.lua +++ b/tex/context/base/font-ctx.lua @@ -9,6 +9,8 @@ if not modules then modules = { } end modules ['font-ctx'] = { -- At some point I will clean up the code here so that at the tex end -- the table interface is used. +local context, commands = context, commands + local texcount, texsetcount = tex.count, tex.setcount local format, gmatch, match, find, lower, gsub, byte = string.format, string.gmatch, string.match, string.find, string.lower, string.gsub, string.byte local concat, serialize, sort, fastcopy, mergedtable = table.concat, table.serialize, table.sort, table.fastcopy, table.merged @@ -53,7 +55,7 @@ local texattribute = tex.attribute local designsizefilename = fontgoodies.designsizes.filename -local otffeatures = fonts.constructors.newfeatures("otf") +local otffeatures = handlers.otf.features local registerotffeature = otffeatures.register local baseprocessors = otffeatures.processors.base local baseinitializers = otffeatures.initializers.base @@ -813,6 +815,7 @@ local setdefaultfontname = context.fntsetdefname local setsomefontname = context.fntsetsomename local setemptyfontsize = context.fntsetnopsize local setsomefontsize = context.fntsetsomesize +local letvaluerelax = context.letvaluerelax function commands.definefont_one(str) statistics.starttiming(fonts) @@ -962,7 +965,7 @@ function commands.definefont_two(global,cs,str,size,inheritancemode,classfeature if not tfmdata then report_defining("unable to define %s as [%s]",name,nice_cs(cs)) lastfontid = -1 - context.letvaluerelax(cs) -- otherwise the current definition takes the previous one + letvaluerelax(cs) -- otherwise the current definition takes the previous one elseif type(tfmdata) == "number" then if trace_defining then report_defining("reusing %s with id %s as [%s] (features: %s/%s, fallbacks: %s/%s, goodies: %s/%s, designsize: %s/%s)", |