2014-07-18 14:14:00

10 files changed, 45 insertions, 56 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 8d9ffde49..45f7ff1ac 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2014.07.18 12:14}
+\newcontextversion{2014.07.18 14:12}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 2edc76c21..b40607408 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 6ac1f7588..c3fc163f6 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.07.18 12:14}
+\edef\contextversion{2014.07.18 14:12}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/font-mis.lua b/tex/context/base/font-mis.lua
index 077baeaba..ea7fe803a 100644
--- a/tex/context/base/font-mis.lua
+++ b/tex/context/base/font-mis.lua
@@ -22,7 +22,7 @@ local handlers = fonts.handlers
 handlers.otf   = handlers.otf or { }
 local otf      = handlers.otf
 
-otf.version    = otf.version or 2.758
+otf.version    = otf.version or 2.759
 otf.cache      = otf.cache   or containers.define("fonts", "otf", otf.version, true)
 
 function otf.loadcached(filename,format,sub)
diff --git a/tex/context/base/font-otf.lua b/tex/context/base/font-otf.lua
index 8e9a43929..688989596 100644
--- a/tex/context/base/font-otf.lua
+++ b/tex/context/base/font-otf.lua
@@ -48,7 +48,7 @@ local otf                = fonts.handlers.otf
 
 otf.glists               = { "gsub", "gpos" }
 
-otf.version              = 2.758 -- beware: also sync font-mis.lua
+otf.version              = 2.759 -- beware: also sync font-mis.lua
 otf.cache                = containers.define("fonts", "otf", otf.version, true)
 
 local fontdata           = fonts.hashes.identifiers
@@ -1499,12 +1499,12 @@ actions["reorganize lookups"] = function(data,filename,raw) -- we could check fo
                             local fore = glyphs.fore
                             if fore and fore ~= "" then
                                 fore = s_uncover(splitter,s_u_cache,fore)
-                                rule.before = s_hashed(fore,s_h_cache)
+                                rule.after = s_hashed(fore,s_h_cache)
                             end
                             local back = glyphs.back
                             if back then
                                 back = s_uncover(splitter,s_u_cache,back)
-                                rule.after = s_hashed(back,s_h_cache)
+                                rule.before = s_hashed(back,s_h_cache)
                             end
                             local names = glyphs.names
                             if names then
diff --git a/tex/context/base/font-otp.lua b/tex/context/base/font-otp.lua
index c80ee86ae..60eee0738 100644
--- a/tex/context/base/font-otp.lua
+++ b/tex/context/base/font-otp.lua
@@ -750,27 +750,28 @@ local function unpackdata(data)
                                     rule.replacements = tv
                                 end
                             end
-                            local fore = rule.fore
-                            if fore then
-                                local tv = tables[fore]
-                                if tv then
-                                    rule.fore = tv
-                                end
-                            end
-                            local back = rule.back
-                            if back then
-                                local tv = tables[back]
-                                if tv then
-                                    rule.back = tv
-                                end
-                            end
-                            local names = rule.names
-                            if names then
-                                local tv = tables[names]
-                                if tv then
-                                    rule.names = tv
-                                end
-                            end
+                         -- local fore = rule.fore
+                         -- if fore then
+                         --     local tv = tables[fore]
+                         --     if tv then
+                         --         rule.fore = tv
+                         --     end
+                         -- end
+                         -- local back = rule.back
+                         -- if back then
+                         --     local tv = tables[back]
+                         --     if tv then
+                         --         rule.back = tv
+                         --     end
+                         -- end
+                         -- local names = rule.names
+                         -- if names then
+                         --     local tv = tables[names]
+                         --     if tv then
+                         --         rule.names = tv
+                         --     end
+                         -- end
+                            --
                             local lookups = rule.lookups
                             if lookups then
                                 local tv = tables[lookups]
diff --git a/tex/context/base/grph-inc.lua b/tex/context/base/grph-inc.lua
index 04e2be410..064cc9c45 100644
--- a/tex/context/base/grph-inc.lua
+++ b/tex/context/base/grph-inc.lua
@@ -266,11 +266,20 @@ trackers.register("graphics.lognames", function(v)
                 report_newline()
                 report_figures("start names")
                 for _, data in table.sortedhash(figures_found) do
+                    local comment = data.comment
                     report_newline()
-                    report_figure("asked  : %s %s",data.askedname,data.badname and "(bad name)" or "")
-                    report_figure("format : %s",data.format)
-                    report_figure("found  : %s",data.foundname)
-                    report_figure("used   : %s",data.fullname)
+                    report_figure("asked   : %s",data.askedname)
+                    if data.badname then
+                        comment = "bad name"
+                    end
+                    if data.found then
+                        report_figure("format  : %s",data.format)
+                        report_figure("found   : %s",data.foundname)
+                        report_figure("used    : %s",data.fullname)
+                    end
+                    if comment then
+                        report_figure("comment : %s",comment)
+                    end
                 end
                 report_newline()
                 report_figures("stop names")
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index a1047ca10..f06bb14b3 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 419871069..7b3ebf9f2 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index f7825065e..293a31996 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  : 07/18/14 12:14:41
+-- merge date  : 07/18/14 14:12:32
 
 do -- begin closure to overcome local limits and interference
 
@@ -6692,7 +6692,7 @@ local report_otf=logs.reporter("fonts","otf loading")
 local fonts=fonts
 local otf=fonts.handlers.otf
 otf.glists={ "gsub","gpos" }
-otf.version=2.758 
+otf.version=2.759 
 otf.cache=containers.define("fonts","otf",otf.version,true)
 local fontdata=fonts.hashes.identifiers
 local chardata=characters and characters.data 
@@ -7902,12 +7902,12 @@ actions["reorganize lookups"]=function(data,filename,raw)
               local fore=glyphs.fore
               if fore and fore~="" then
                 fore=s_uncover(splitter,s_u_cache,fore)
-                rule.before=s_hashed(fore,s_h_cache)
+                rule.after=s_hashed(fore,s_h_cache)
               end
               local back=glyphs.back
               if back then
                 back=s_uncover(splitter,s_u_cache,back)
-                rule.after=s_hashed(back,s_h_cache)
+                rule.before=s_hashed(back,s_h_cache)
               end
               local names=glyphs.names
               if names then
@@ -13065,27 +13065,6 @@ local function unpackdata(data)
                   rule.replacements=tv
                 end
               end
-              local fore=rule.fore
-              if fore then
-                local tv=tables[fore]
-                if tv then
-                  rule.fore=tv
-                end
-              end
-              local back=rule.back
-              if back then
-                local tv=tables[back]
-                if tv then
-                  rule.back=tv
-                end
-              end
-              local names=rule.names
-              if names then
-                local tv=tables[names]
-                if tv then
-                  rule.names=tv
-                end
-              end
               local lookups=rule.lookups
               if lookups then
                 local tv=tables[lookups]