beta 2011.02.11 12:23

1 files changed, 9 insertions, 9 deletions

diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 6aacb9857..0563456d0 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 02/10/11 13:23:45
+-- merge date  : 02/11/11 12:23:06
 
 do -- begin closure to overcome local limits and interference
 
@@ -5533,11 +5533,11 @@ fonts.map.addtounicode = function(data,filename)
         cidcodes = usedmap.unicodes
     end
     uparser = makenameparser()
-    local aglmap = fonts.enc and fonts.enc.agl -- to name
+    local unicodevector = fonts.enc.agl.unicodes -- loaded runtime in context
     for index, glyph in next, data.glyphs do
         local name, unic = glyph.name, glyph.unicode or -1 -- play safe
         if unic == -1 or unic >= private or (unic >= 0xE000 and unic <= 0xF8FF) or unic == 0xFFFE or unic == 0xFFFF then
-            local unicode = (lumunic and lumunic[name]) or (aglmap and aglmap[name])
+            local unicode = (lumunic and lumunic[name]) or unicodevector[name]
             if unicode then
                 originals[index], tounicode[index], ns = unicode, tounicode16(unicode), ns + 1
             end
@@ -5581,7 +5581,7 @@ fonts.map.addtounicode = function(data,filename)
                     -- skip
                 elseif nplit == 1 then
                     local base = split[1]
-                    unicode = unicodes[base] or (aglmap and aglmap[base])
+                    unicode = unicodes[base] or unicodevector[base]
                     if unicode then
                         if type(unicode) == "table" then
                             unicode = unicode[1]
@@ -5592,7 +5592,7 @@ fonts.map.addtounicode = function(data,filename)
                     local t, n = { }, 0
                     for l=1,nplit do
                         local base = split[l]
-                        local u = unicodes[base] or (aglmap and aglmap[base])
+                        local u = unicodes[base] or unicodevector[base]
                         if not u then
                             break
                         elseif type(u) == "table" then
@@ -15419,12 +15419,12 @@ for k, v in next, extras do
     end
 end
 
--- can be a return and loaded on demand
+-- can be a return and loaded on demands (although there are no more vectors like this)
 
 fonts.enc.agl = {
-    names    = names,
-    extras   = extras,
-    unicodes = unicodes,
+    names    = names,     -- unicode -> name
+    unicodes = unicodes,  -- name -> unicode
+    extras   = extras,    -- merged into the other two
 }
 
 -- dofile("char-def.lua")