diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/lpdf-col.lua')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/lpdf-col.lua | 87 |
1 files changed, 39 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/lpdf-col.lua b/Master/texmf-dist/tex/context/base/mkiv/lpdf-col.lua index 9ba64abba75..c586300e55b 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/lpdf-col.lua +++ b/Master/texmf-dist/tex/context/base/mkiv/lpdf-col.lua @@ -6,6 +6,8 @@ if not modules then modules = { } end modules ['lpdf-col'] = { license = "see context related readme files" } +-- slants also page ? + local type, next, tostring, tonumber = type, next, tostring, tonumber local char, byte, format, gsub, rep, gmatch = string.char, string.byte, string.format, string.gsub, string.rep, string.gmatch local settings_to_array, settings_to_numbers = utilities.parsers.settings_to_array, utilities.parsers.settings_to_numbers @@ -58,25 +60,18 @@ local setmetatableindex = table.setmetatableindex 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_gray = formatters["%.3N g %.3N G"] +local f_rgb = formatters["%.3N %.3N %.3N rg %.3N %.3N %.3N RG"] +local f_cmyk = formatters["%.3N %.3N %.3N %.3N k %.3N %.3N %.3N %.3N K"] local f_spot = formatters["/%s cs /%s CS %s SCN %s scn"] local f_tr = formatters["Tr%s"] -local f_cm = formatters["q %.6F %.6F %.6F %.6F %.6F %.6F cm"] -local f_effect = formatters["%s Tc %s w %s Tr"] -- %.3F ? +local f_cm = formatters["q %.6N %.6N %.6N %.6N %.6N %.6N cm"] +local f_effect = formatters["%s Tc %s w %s Tr"] -- %.6N ? local f_tr_gs = formatters["/Tr%s gs"] -local f_num_1 = tostring -local f_num_2 = formatters["%s %s"] -local f_num_3 = formatters["%s %s %s"] -local f_num_4 = formatters["%s %s %s %s"] - -directives.register("pdf.stripzeros",function() - f_gray = formatters["%.3N g %.3N G"] - f_rgb = formatters["%.3N %.3N %.3N rg %.3N %.3N %.3N RG"] - f_cmyk = formatters["%.3N %.3N %.3N %.3N k %.3N %.3N %.3N %.3N K"] - f_cm = formatters["q %.6N %.6N %.6N %.6N %.6N %.6N cm"] -end) +local f_num_1 = formatters["%.3N %.3N"] +local f_num_2 = formatters["%.3N %.3N"] +local f_num_3 = formatters["%.3N %.3N %.3N"] +local f_num_4 = formatters["%.3N %.3N %.3N %.3N"] local report_color = logs.reporter("colors","backend") @@ -733,43 +728,39 @@ do local pdfcolor = lpdf.color local pdftransparency = lpdf.transparency - local f_slant = formatters["q 1 0 %.6F 1 0 0 cm"] - - directives.register("pdf.stripzeros",function() - f_slant = formatters["q 1 0 %.6N 1 0 0 cm"] - end) + local f_slant = formatters["q 1 0 %N 1 0 0 cm"] -- local fillcolors = { - -- red = { "pdf", "origin", "1 0 0 rg" }, - -- green = { "pdf", "origin", "0 1 0 rg" }, - -- blue = { "pdf", "origin", "0 0 1 rg" }, - -- gray = { "pdf", "origin", ".5 g" }, - -- black = { "pdf", "origin", "0 g" }, - -- palered = { "pdf", "origin", "1 .75 .75 rg" }, - -- palegreen = { "pdf", "origin", ".75 1 .75 rg" }, - -- paleblue = { "pdf", "origin", ".75 .75 1 rg" }, - -- palegray = { "pdf", "origin", ".75 g" }, + -- red = { "pdf", "page", "1 0 0 rg" }, + -- green = { "pdf", "page", "0 1 0 rg" }, + -- blue = { "pdf", "page", "0 0 1 rg" }, + -- gray = { "pdf", "page", ".5 g" }, + -- black = { "pdf", "page", "0 g" }, + -- palered = { "pdf", "page", "1 .75 .75 rg" }, + -- palegreen = { "pdf", "page", ".75 1 .75 rg" }, + -- paleblue = { "pdf", "page", ".75 .75 1 rg" }, + -- palegray = { "pdf", "page", ".75 g" }, -- } -- -- local strokecolors = { - -- red = { "pdf", "origin", "1 0 0 RG" }, - -- green = { "pdf", "origin", "0 1 0 RG" }, - -- blue = { "pdf", "origin", "0 0 1 RG" }, - -- gray = { "pdf", "origin", ".5 G" }, - -- black = { "pdf", "origin", "0 G" }, - -- palered = { "pdf", "origin", "1 .75 .75 RG" }, - -- palegreen = { "pdf", "origin", ".75 1 .75 RG" }, - -- paleblue = { "pdf", "origin", ".75 .75 1 RG" }, - -- palegray = { "pdf", "origin", ".75 G" }, + -- red = { "pdf", "page", "1 0 0 RG" }, + -- green = { "pdf", "page", "0 1 0 RG" }, + -- blue = { "pdf", "page", "0 0 1 RG" }, + -- gray = { "pdf", "page", ".5 G" }, + -- black = { "pdf", "page", "0 G" }, + -- palered = { "pdf", "page", "1 .75 .75 RG" }, + -- palegreen = { "pdf", "page", ".75 1 .75 RG" }, + -- paleblue = { "pdf", "page", ".75 .75 1 RG" }, + -- palegray = { "pdf", "page", ".75 G" }, -- } -- -- backends.pdf.tables.vfspecials = allocate { -- todo: distinguish between glyph and rule color -- - -- red = { "pdf", "origin", "1 0 0 rg 1 0 0 RG" }, - -- green = { "pdf", "origin", "0 1 0 rg 0 1 0 RG" }, - -- blue = { "pdf", "origin", "0 0 1 rg 0 0 1 RG" }, - -- gray = { "pdf", "origin", ".75 g .75 G" }, - -- black = { "pdf", "origin", "0 g 0 G" }, + -- red = { "pdf", "page", "1 0 0 rg 1 0 0 RG" }, + -- green = { "pdf", "page", "0 1 0 rg 0 1 0 RG" }, + -- blue = { "pdf", "page", "0 0 1 rg 0 0 1 RG" }, + -- gray = { "pdf", "page", ".75 g .75 G" }, + -- black = { "pdf", "page", "0 g 0 G" }, -- -- -- rulecolors = fillcolors, -- -- fillcolors = fillcolors, @@ -792,7 +783,7 @@ do local c_cache = setmetatableindex(function(t,m) local v = setmetatableindex(function(t,c) - local p = { "pdf", "origin", "q " .. pdfcolor(m,c) } + local p = { "pdf", "page", "q " .. pdfcolor(m,c) } t[c] = p return p end) @@ -806,7 +797,7 @@ do local p = pdftransparency(transparency) local v = setmetatableindex(function(t,colormodel) local v = setmetatableindex(function(t,color) - local v = { "pdf", "origin", "q " .. pdfcolor(colormodel,color) .. " " .. p } + local v = { "pdf", "page", "q " .. pdfcolor(colormodel,color) .. " " .. p } t[color] = v return v end) @@ -830,8 +821,8 @@ do backends.pdf.tables.vfspecials = allocate { -- todo: distinguish between glyph and rule color startcolor = startcolor, - -- stopcolor = { "pdf", "origin", "0 g 0 G Q" }, - stopcolor = { "pdf", "origin", "Q" }, + -- stopcolor = { "pdf", "page", "0 g 0 G Q" }, + stopcolor = { "pdf", "page", "Q" }, startslant = startslant, stopslant = { "pdf", "origin", "Q" }, |