summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2013-04-20 01:08:00 +0200
committerHans Hagen <pragma@wxs.nl>2013-04-20 01:08:00 +0200
commit4b10f77df0327809209b3d318e8386666aabb1f5 (patch)
treef736839dc4db40f6cbfdb5a33ae99fb36fa2f78d /tex/generic
parent7b107268d43038815d72037d28dbb3a3e4331d64 (diff)
downloadcontext-4b10f77df0327809209b3d318e8386666aabb1f5.tar.gz
beta 2013.04.20 01:08
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e8eb49c9c..c5ce7b5ce 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 04/19/13 16:29:24
+-- merge date : 04/20/13 01:08:47
do -- begin closure to overcome local limits and interference
@@ -10376,6 +10376,7 @@ local variants=allocate()
specifiers.variants=variants
definers.methods=definers.methods or {}
local internalized=allocate()
+local lastdefined=nil
local loadedfonts=constructors.loadedfonts
local designsizes=constructors.designsizes
local resolvefile=fontgoodies and fontgoodies.filenames and fontgoodies.filenames.resolve or function(s) return s end
@@ -10590,6 +10591,7 @@ function constructors.readanddefine(name,size)
if not id then
local tfmdata=definers.loadfont(specification)
if tfmdata then
+ tfmdata.properties.hash=hash
constructors.checkvirtualids(tfmdata)
id=font.define(tfmdata)
definers.register(tfmdata,id)
@@ -10599,8 +10601,6 @@ function constructors.readanddefine(name,size)
end
return fontdata[id],id
end
-local lastdefined=nil
-local internalized={}
function definers.current()
return lastdefined
end