2014-04-28 23:25:00

1 files changed, 53 insertions, 44 deletions

diff --git a/tex/context/base/lpdf-col.lua b/tex/context/base/lpdf-col.lua
index b358d0820..9e483f9b5 100644
--- a/tex/context/base/lpdf-col.lua
+++ b/tex/context/base/lpdf-col.lua
@@ -14,42 +14,49 @@ local formatters = string.formatters
 
 local backends, lpdf, nodes = backends, lpdf, nodes
 
-local allocate             = utilities.storage.allocate
-local formatters           = string.formatters
-
-local nodeinjections       = backends.pdf.nodeinjections
-local codeinjections       = backends.pdf.codeinjections
-local registrations        = backends.pdf.registrations
-
-local nodepool             = nodes.pool
-local register             = nodepool.register
-local pdfliteral           = nodepool.pdfliteral
-
-local pdfconstant          = lpdf.constant
-local pdfstring            = lpdf.string
-local pdfdictionary        = lpdf.dictionary
-local pdfarray             = lpdf.array
-local pdfreference         = lpdf.reference
-local pdfverbose           = lpdf.verbose
-local pdfflushobject       = lpdf.flushobject
-local pdfflushstreamobject = lpdf.flushstreamobject
-
-local colors               = attributes.colors
-local transparencies       = attributes.transparencies
-local registertransparancy = transparencies.register
-local registercolor        = colors.register
-local colorsvalue          = colors.value
-local transparenciesvalue  = transparencies.value
-local forcedmodel          = colors.forcedmodel
-
-local c_transparency = pdfconstant("Transparency")
-
-local f_gray   = formatters["%.3f g %.3f G"]
-local f_rgb    = formatters["%.3f %.3f %.3f rg %.3f %.3f %.3f RG"]
-local f_cmyk   = formatters["%.3f %.3f %.3f %.3f k %.3f %.3f %.3f %.3f K"]
+local allocate                = utilities.storage.allocate
+local formatters              = string.formatters
+
+local nodeinjections          = backends.pdf.nodeinjections
+local codeinjections          = backends.pdf.codeinjections
+local registrations           = backends.pdf.registrations
+
+local nodepool                = nodes.pool
+local register                = nodepool.register
+local pdfliteral              = nodepool.pdfliteral
+
+local pdfconstant             = lpdf.constant
+local pdfstring               = lpdf.string
+local pdfdictionary           = lpdf.dictionary
+local pdfarray                = lpdf.array
+local pdfreference            = lpdf.reference
+local pdfverbose              = lpdf.verbose
+local pdfflushobject          = lpdf.flushobject
+local pdfdelayedobject        = lpdf.delayedobject
+local pdfflushstreamobject    = lpdf.flushstreamobject
+
+local pdfshareobjectreference = lpdf.shareobjectreference
+
+local addtopageattributes     = lpdf.addtopageattributes
+local adddocumentcolorspace   = lpdf.adddocumentcolorspace
+local adddocumentextgstate    = lpdf.adddocumentextgstate
+
+local colors                  = attributes.colors
+local transparencies          = attributes.transparencies
+local registertransparancy    = transparencies.register
+local registercolor           = colors.register
+local colorsvalue             = colors.value
+local transparenciesvalue     = transparencies.value
+local forcedmodel             = colors.forcedmodel
+
+local c_transparency          = pdfconstant("Transparency")
+
+local f_gray   = formatters["%.3F g %.3F G"]
+local f_rgb    = formatters["%.3F %.3F %.3F rg %.3F %.3F %.3F RG"]
+local f_cmyk   = formatters["%.3F %.3F %.3F %.3F k %.3F %.3F %.3F %.3F K"]
 local f_spot   = formatters["/%s cs /%s CS %s SCN %s scn"]
 local f_tr     = formatters["Tr%s"]
-local f_cm     = formatters["q %f %f %f %f %f %f cm"]
+local f_cm     = formatters["q %F %F %F %F %F %F cm"]
 local f_effect = formatters["%s Tc %s w %s Tr"]
 local f_tr_gs  = formatters["/Tr%s gs"]
 local f_num_1  = tostring
@@ -76,11 +83,13 @@ lpdf.transparencygroups  = transparencygroups
 table.setmetatableindex(transparencygroups, function(transparencygroups,colormodel)
     local cs = colorspaceconstants[colormodel]
     if cs then
-        local g = pdfreference(pdfflushobject(pdfdictionary {
+        local d = pdfdictionary {
             S  = c_transparency,
             CS = cs,
             I  = true,
-        }))
+        }
+     -- local g = pdfreference(pdfflushobject(tostring(d)))
+        local g = pdfreference(pdfdelayedobject(tostring(d)))
         transparencygroups[colormodel] = g
         return g
     else
@@ -95,7 +104,7 @@ local function addpagegroup()
     if currentgroupcolormodel then
         local g = transparencygroups[currentgroupcolormodel]
         if g then
-            lpdf.addtopageattributes("Group",g)
+            addtopageattributes("Group",g)
         end
     end
 end
@@ -224,7 +233,7 @@ local function registersomespotcolor(name,noffractions,names,p,colorspace,range,
         local mr = pdfreference(m)
         spotcolorhash[name] = m
         documentcolorspaces[name] = mr
-        lpdf.adddocumentcolorspace(name,mr)
+        adddocumentcolorspace(name,mr)
     else
         local cnames = pdfarray()
         local domain = pdfarray()
@@ -280,13 +289,13 @@ local function registersomespotcolor(name,noffractions,names,p,colorspace,range,
             cnames,
             colorspace,
             pdfreference(calculation),
-            lpdf.shareobjectreference(tostring(channels)), -- optional but needed for shades
+            pdfshareobjectreference(tostring(channels)), -- optional but needed for shades
         }
         local m = pdfflushobject(array)
         local mr = pdfreference(m)
         spotcolorhash[name] = m
         documentcolorspaces[name] = mr
-        lpdf.adddocumentcolorspace(name,mr)
+        adddocumentcolorspace(name,mr)
     end
 end
 
@@ -336,7 +345,7 @@ local function registersomeindexcolor(name,noffractions,names,p,colorspace,range
     end
     vector = pdfverbose { "<", concat(vector, " "), ">" }
     local n = pdfflushobject(pdfarray{ pdf_indexed, a, 255, vector })
-    lpdf.adddocumentcolorspace(format("%s_indexed",name),pdfreference(n))
+    adddocumentcolorspace(format("%s_indexed",name),pdfreference(n))
     return n
 end
 
@@ -455,7 +464,7 @@ function registrations.transparency(n,a,t)
         local mr = pdfreference(m)
         transparencyhash[0] = m
         documenttransparencies[0] = mr
-        lpdf.adddocumentextgstate("Tr0",mr)
+        adddocumentextgstate("Tr0",mr)
         done = true
     end
     if n > 0 and not transparencyhash[n] then
@@ -470,7 +479,7 @@ function registrations.transparency(n,a,t)
         local mr = pdfreference(m)
         transparencyhash[n] = m
         documenttransparencies[n] = mr
-        lpdf.adddocumentextgstate(f_tr(n),mr)
+        adddocumentextgstate(f_tr(n),mr)
     end
 end
 
@@ -689,7 +698,7 @@ end
 
 -- this will move to lpdf-spe.lua
 
-local f_slant = formatters["pdf: q 1 0 %f 1 0 0 cm"]
+local f_slant = formatters["pdf: q 1 0 %F 1 0 0 cm"]
 
 backends.pdf.tables.vfspecials = allocate { -- todo: distinguish between glyph and rule color