2018-05-12 00:16:00

1 files changed, 12 insertions, 9 deletions

diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua
index 8af1fb409..89b87ed11 100644
--- a/tex/context/base/mkiv/lpdf-ini.lua
+++ b/tex/context/base/mkiv/lpdf-ini.lua
@@ -362,8 +362,10 @@ local f_key_dictionary = formatters["/%s << % t >>"]
 local f_dictionary     = formatters["<< % t >>"]
 local f_key_array      = formatters["/%s [ % t ]"]
 local f_array          = formatters["[ % t ]"]
-local f_key_number     = formatters["/%s %F"]
-local f_tonumber       = formatters["%F"]
+----- f_key_number     = formatters["/%s %F"]
+local f_key_number     = formatters["/%s %n"]
+----- f_tonumber       = formatters["%F"]
+local f_tonumber       = formatters["%n"]
 
 local tostring_a, tostring_d
 
@@ -734,12 +736,13 @@ function lpdf.flushobject(name,data)
 end
 
 
-function lpdf.flushstreamobject(data,dict,compressed) -- default compressed
+function lpdf.flushstreamobject(data,dict,compressed,objnum) -- default compressed
     if trace_objects then
         report_objects("flushing stream object of %s bytes",#data)
     end
     local dtype = type(dict)
     return pdfdeferredobject {
+        objnum        = objnum,
         immediate     = true,
         compresslevel = compressed == false and 0 or nil,
         type          = "stream",
@@ -748,12 +751,13 @@ function lpdf.flushstreamobject(data,dict,compressed) -- default compressed
     }
 end
 
-function lpdf.flushstreamfileobject(filename,dict,compressed) -- default compressed
+function lpdf.flushstreamfileobject(filename,dict,compressed,objnum) -- default compressed
     if trace_objects then
         report_objects("flushing stream file object %a",filename)
     end
     local dtype = type(dict)
     return pdfdeferredobject {
+        objnum        = objnum,
         immediate     = true,
         compresslevel = compressed == false and 0 or nil,
         type          = "stream",
@@ -905,13 +909,12 @@ if not callbacks.register("finish_pdfpage", lpdf.finalizepage) then
         return head, true
     end
 
-    nodes.tasks.appendaction("shipouts","normalizers","backends.pdf.nodeinjections.finalizepage")
+    nodes.tasks.enableaction("shipouts","backends.pdf.nodeinjections.finalizepage")
 
 end
 
 callbacks.register("finish_pdffile", lpdf.finalizedocument)
 
-
 do
 
     -- some minimal tracing, handy for checking the order
@@ -1127,12 +1130,12 @@ do
         return Y and format("D:%s%s%s%s%s%s%s%s'%s'",Y,M,D,h,m,s,Zs,Zh,Zm)
     end
 
-    function lpdf.id(nodate)
+    function lpdf.id(date)
         local banner = environment.jobname or tex.jobname or "unknown"
-        if nodate then
+        if not date then
             return banner
         else
-            return format("%s.%s",banner,timestamp)
+            return format("%s | %s",banner,timestamp)
         end
     end